Scott Main
eb0bce61d7
am 6856ef5b
: (-s ours) am 61e63c8a
: am 52948fcf
: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
...
* commit '6856ef5b07b128ecb5daa966f7486503b9cc5f20':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 21:00:19 -07:00
Scott Main
6856ef5b07
am 61e63c8a
: am 52948fcf
: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
...
* commit '61e63c8a4bdb6174a08023d4b55fe2af896ed878':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 20:59:09 -07:00
Scott Main
61e63c8a4b
am 52948fcf
: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
...
* commit '52948fcf8ccdad1f4ba91d63ece2022e2d807aff':
DO NOT MERGE cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626 create consistent spacing between lists and the paragraphs within them
2012-10-02 20:57:44 -07:00
Scott Main
52948fcf8c
DO NOT MERGE
...
cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
create consistent spacing between lists and the paragraphs within them
Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977
2012-10-02 20:53:11 -07:00
Scott Main
b61c601b57
am 2452b062
: am 0c81a130
: provide more width for buttons in training top nav to accomodate longer strings from translation
...
* commit '2452b0625c18bb11a37eb9216078a83f41971240':
provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:42:29 -07:00
Scott Main
2452b0625c
am 0c81a130
: provide more width for buttons in training top nav to accomodate longer strings from translation
...
* commit '0c81a130ef01981a0cbc3564c26658c51951812d':
provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:40:14 -07:00
Scott Main
0c81a130ef
provide more width for buttons in training top nav to accomodate longer
...
strings from translation
Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 20:36:45 -07:00
Scott Main
cbefa6445e
am b649b416
: am 235f4d4f
: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
...
* commit 'b649b41604822cc0c9c32b3bc98233a8ab1148c9':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:32:11 -07:00
Scott Main
b649b41604
am 235f4d4f
: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
...
* commit '235f4d4f8580a56d553e19c1beab1f8c22132e84':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:29:45 -07:00
Scott Main
235f4d4f85
refactor the logic for changing languages in global strings.
...
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.
Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 17:44:42 -07:00
Scott Main
817c088203
am 74811834
: am dd3d3eea
: add localize langs for global strings
...
* commit '748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
add localize langs for global strings
2012-10-02 14:49:07 -07:00
The Android Open Source Project
5759deadaa
am a6c77d92
: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
...
* commit 'a6c77d92fcbc2a39758ab28c32b701025d637a7b':
JZO54K
JRO03X
2012-10-02 14:49:06 -07:00
Scott Main
748118343d
am dd3d3eea
: add localize langs for global strings
...
* commit 'dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
add localize langs for global strings
2012-10-02 14:47:52 -07:00
The Android Open Source Project
a6c77d92fc
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83
2012-10-02 14:47:23 -07:00
Scott Main
dd3d3eea1d
add localize langs for global strings
...
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
2012-10-02 14:44:54 -07:00
The Android Automerger
25454bc3d2
JZO54K
2012-10-02 13:59:47 -07:00
Ian Rogers
76a6dc3a19
Fix common typo in comments, warning and error messages.
...
s/can not/cannot/g
Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
2012-10-01 16:36:23 -07:00
The Android Automerger
bd9d29b0e3
JRO03X
2012-09-28 16:24:01 -07:00
Ying Wang
9eb2e01072
Merge "Load only the current product config makefile." into jb-mr1-dev
2012-09-28 15:11:11 -07:00
Ying Wang
54fa8c3ff9
Load only the current product config makefile.
...
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
2012-09-28 15:08:12 -07:00
The Android Open Source Project
1d55338d61
am 91f71ca3
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit '91f71ca30ffd88a1d90abb09d4a677f1a4a35938':
JZO54J
2012-09-28 12:58:26 -07:00
The Android Open Source Project
91f71ca30f
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211
2012-09-28 12:52:59 -07:00
The Android Automerger
0d6a91eec6
JZO54J
2012-09-28 11:59:46 -07:00
Ying Wang
f7592d987d
Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
2012-09-28 10:24:41 -07:00
Ying Wang
9cb3731a77
Run clean steps in only given paths when using mm/mmm
...
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.
Bug: 7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
2012-09-28 10:23:52 -07:00
Dianne Hackborn
0bc0394688
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
...
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
2012-09-27 15:11:47 -07:00
Dianne Hackborn
edc24bb89c
Merge "Make runhat command work again." into jb-mr1-dev
2012-09-26 15:25:23 -07:00
Dianne Hackborn
6b9549fd73
Make runhat command work again.
...
Change-Id: Ia3d2aefd32579b61da72e65c78dc6053dbaaad28
2012-09-26 15:00:59 -07:00
The Android Open Source Project
96b17f8e99
am a8a731bf
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
2012-09-26 09:00:24 -07:00
The Android Open Source Project
a8a731bf7f
Reconcile with jb-mr0-release - do not merge
...
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
2012-09-26 08:58:17 -07:00
The Android Automerger
ba7bed7552
JZO54I
2012-09-25 21:50:16 -07:00
Bart Sears
0b7e0983d4
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
2012-09-24 13:06:06 -07:00
Siva Velusamy
53e714209b
Revert "Include videoeditor_jni in sdk product build."
...
This reverts commit 997e629d6d
.
2012-09-24 10:24:17 -07:00
The Android Open Source Project
cc71f1ea0b
am d50926a0
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'd50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
2012-09-24 08:26:41 -07:00
The Android Open Source Project
d50926a047
Reconcile with jb-mr0-release - do not merge
...
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
2012-09-24 07:38:53 -07:00
Bart Sears
04873af062
Add the new NanumGothic makefile to the build
...
There are separate CLs to add the NanumGothic font files
and makefiles.
Bug: 4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
2012-09-24 00:11:00 -07:00
Ying Wang
f8f2b022e9
Ignore support library Proguard warning
...
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version. We know about them, and they are safe.
Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
2012-09-23 13:46:58 -07:00
The Android Automerger
b097af8279
JZO54H
2012-09-21 18:02:14 -07:00
Siva Velusamy
32130c6d09
Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
2012-09-21 15:00:28 -07:00
Scott Main
57a0a4c1fe
am dcce7ca6
: am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit 'dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:56:35 -07:00
Scott Main
dcce7ca6a8
am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:54:09 -07:00
Scott Main
582db97b23
add style for code captions;
...
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
2012-09-21 14:33:43 -07:00
Siva Velusamy
997e629d6d
Include videoeditor_jni in sdk product build.
...
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk
Fixes Bug 7200384
Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
2012-09-21 14:23:50 -07:00
Ying Wang
20a7c2c10d
Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
2012-09-20 17:12:01 -07:00
Zhihai Xu
d81b9d220e
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
2012-09-20 16:42:47 -07:00
Ying Wang
4b0486b4a6
Allow to tag owner to PRODUCT_COPY_FILES
...
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.
Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
2012-09-20 16:37:55 -07:00
Keun young Park
fe1d3b12de
Merge "fix PDK build" into jb-mr1-dev
2012-09-20 14:34:48 -07:00
Keun young Park
6530b38d7c
fix PDK build
...
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
2012-09-20 14:31:17 -07:00
Ying Wang
7884dfc645
Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev
2012-09-20 14:07:37 -07:00
Doug Zongker
c4d68391cc
Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
2012-09-20 12:02:24 -07:00