OSDN Git Service
Scott Main [Tue, 2 Oct 2012 21:52:48 +0000 (14:52 -0700)]
am
ca1ee0fd: am
817c0882: am
74811834: am
dd3d3eea: add localize langs for global strings
* commit '
ca1ee0fdc15a54f8ea0e6b247fa3c80c96c7bc9a':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:52:47 +0000 (14:52 -0700)]
am
d3ccfd53: am
5759dead: am
a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
d3ccfd53fe5c0bb4138b22acb818d567a4ca2466':
JZO54K
JRO03X
Scott Main [Tue, 2 Oct 2012 21:51:19 +0000 (14:51 -0700)]
am
817c0882: am
74811834: am
dd3d3eea: add localize langs for global strings
* commit '
817c088203a947355b7e76ac6c19b4fbbb6a6bcc':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:51:18 +0000 (14:51 -0700)]
am
5759dead: am
a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
5759deadaad0b1055a703b11ed6509b8e46a0140':
JZO54K
JRO03X
Scott Main [Tue, 2 Oct 2012 21:49:07 +0000 (14:49 -0700)]
am
74811834: am
dd3d3eea: add localize langs for global strings
* commit '
748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:49:06 +0000 (14:49 -0700)]
am
a6c77d92: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
a6c77d92fcbc2a39758ab28c32b701025d637a7b':
JZO54K
JRO03X
Scott Main [Tue, 2 Oct 2012 21:47:52 +0000 (14:47 -0700)]
am
dd3d3eea: add localize langs for global strings
* commit '
dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
add localize langs for global strings
The Android Open Source Project [Tue, 2 Oct 2012 21:47:23 +0000 (14:47 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I4a96ee0e6bfce143dcf36ad1831f5fbe41965a83
Scott Main [Sat, 22 Sep 2012 03:32:56 +0000 (20:32 -0700)]
add localize langs for global strings
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
The Android Automerger [Tue, 2 Oct 2012 20:59:47 +0000 (13:59 -0700)]
JZO54K
The Android Open Source Project [Tue, 2 Oct 2012 16:16:40 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idf57d68a4ada6c27598df190a000f621bc15dcbf
The Android Automerger [Tue, 2 Oct 2012 14:01:18 +0000 (07:01 -0700)]
JOP02
The Android Automerger [Tue, 2 Oct 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ian Rogers [Tue, 2 Oct 2012 00:26:02 +0000 (17:26 -0700)]
am
9acbbf12: am
76a6dc3a: Fix common typo in comments, warning and error messages.
* commit '
9acbbf1267fc43bac61320a36dbf92edd00a357a':
Fix common typo in comments, warning and error messages.
Ian Rogers [Tue, 2 Oct 2012 00:23:57 +0000 (17:23 -0700)]
am
76a6dc3a: Fix common typo in comments, warning and error messages.
* commit '
76a6dc3a191e8800211eb49398d37deae731094e':
Fix common typo in comments, warning and error messages.
Ian Rogers [Mon, 1 Oct 2012 23:36:23 +0000 (16:36 -0700)]
Fix common typo in comments, warning and error messages.
s/can not/cannot/g
Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
The Android Automerger [Mon, 1 Oct 2012 23:21:17 +0000 (16:21 -0700)]
JOP01B
The Android Automerger [Mon, 1 Oct 2012 14:00:00 +0000 (07:00 -0700)]
JOP01
The Android Automerger [Mon, 1 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 01:18:26 +0000 (18:18 -0700)]
JOO92B
The Android Automerger [Mon, 1 Oct 2012 01:17:21 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 14:01:34 +0000 (07:01 -0700)]
JOO92
The Android Automerger [Sun, 30 Sep 2012 13:59:16 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Baptiste Queru [Sat, 29 Sep 2012 00:07:43 +0000 (17:07 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: Ifa8ee5e59bb3f61df4de47d52c062449bdea4911
The Android Automerger [Fri, 28 Sep 2012 23:24:01 +0000 (16:24 -0700)]
JRO03X
Ying Wang [Fri, 28 Sep 2012 22:16:59 +0000 (15:16 -0700)]
am
9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev
* commit '
9eb2e010726039a9f38dc9dfda16487ba8a47eca':
Load only the current product config makefile.
Ying Wang [Fri, 28 Sep 2012 22:15:46 +0000 (15:15 -0700)]
am
9eb2e010: Merge "Load only the current product config makefile." into jb-mr1-dev
* commit '
9eb2e010726039a9f38dc9dfda16487ba8a47eca':
Load only the current product config makefile.
Ying Wang [Fri, 28 Sep 2012 22:11:10 +0000 (15:11 -0700)]
Merge "Load only the current product config makefile." into jb-mr1-dev
Ying Wang [Thu, 27 Sep 2012 20:26:25 +0000 (13:26 -0700)]
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
The Android Automerger [Fri, 28 Sep 2012 21:17:39 +0000 (14:17 -0700)]
JOO90B
Jean-Baptiste Queru [Fri, 28 Sep 2012 21:17:13 +0000 (14:17 -0700)]
Merge from jb-mr1-aah-dev
Change-Id: Ia884306cfe4a9389856be0f377351aacf4cb2e36
The Android Open Source Project [Fri, 28 Sep 2012 20:01:40 +0000 (13:01 -0700)]
am
1d55338d: (-s ours) am
91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
1d55338d613f0b4f4dd35de75d1a40de51a7bf31':
JZO54J
The Android Open Source Project [Fri, 28 Sep 2012 20:01:29 +0000 (13:01 -0700)]
am
1d55338d: am
91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
1d55338d613f0b4f4dd35de75d1a40de51a7bf31':
JZO54J
The Android Open Source Project [Fri, 28 Sep 2012 19:58:26 +0000 (12:58 -0700)]
am
91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
91f71ca30ffd88a1d90abb09d4a677f1a4a35938':
JZO54J
The Android Open Source Project [Fri, 28 Sep 2012 19:52:59 +0000 (12:52 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211
The Android Automerger [Fri, 28 Sep 2012 18:59:46 +0000 (11:59 -0700)]
JZO54J
Ying Wang [Fri, 28 Sep 2012 17:26:32 +0000 (10:26 -0700)]
am
f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
* commit '
f7592d987d38d434a4ad1f43607a2151dad2cd4f':
Run clean steps in only given paths when using mm/mmm
Ying Wang [Fri, 28 Sep 2012 17:25:43 +0000 (10:25 -0700)]
am
f7592d98: Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
* commit '
f7592d987d38d434a4ad1f43607a2151dad2cd4f':
Run clean steps in only given paths when using mm/mmm
Ying Wang [Fri, 28 Sep 2012 17:24:40 +0000 (10:24 -0700)]
Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
Ying Wang [Wed, 26 Sep 2012 23:00:54 +0000 (16:00 -0700)]
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
The Android Automerger [Fri, 28 Sep 2012 14:01:05 +0000 (07:01 -0700)]
JOO90
The Android Automerger [Fri, 28 Sep 2012 13:59:04 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 28 Sep 2012 05:57:13 +0000 (22:57 -0700)]
JOO89C
The Android Automerger [Fri, 28 Sep 2012 00:29:30 +0000 (17:29 -0700)]
JOO89B
Dianne Hackborn [Thu, 27 Sep 2012 23:29:14 +0000 (16:29 -0700)]
am
0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17!
* commit '
0bc03946889f04b333ec46ee4695a987ad7b4c0f':
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Dianne Hackborn [Thu, 27 Sep 2012 23:28:13 +0000 (16:28 -0700)]
am
0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17!
* commit '
0bc03946889f04b333ec46ee4695a987ad7b4c0f':
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Dianne Hackborn [Thu, 27 Sep 2012 22:10:40 +0000 (15:10 -0700)]
Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
The Android Open Source Project [Thu, 27 Sep 2012 16:56:57 +0000 (09:56 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ib1b937c8a7adceaa522b13529b2b6ad4bb3726aa
The Android Automerger [Thu, 27 Sep 2012 14:01:47 +0000 (07:01 -0700)]
JOO89
The Android Automerger [Thu, 27 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 27 Sep 2012 01:38:33 +0000 (18:38 -0700)]
JOO88C
Dianne Hackborn [Wed, 26 Sep 2012 22:27:15 +0000 (15:27 -0700)]
am
edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev
* commit '
edc24bb89c87d88c2da530812d64ae60d59a53e9':
Make runhat command work again.
Dianne Hackborn [Wed, 26 Sep 2012 22:27:14 +0000 (15:27 -0700)]
am
edc24bb8: Merge "Make runhat command work again." into jb-mr1-dev
* commit '
edc24bb89c87d88c2da530812d64ae60d59a53e9':
Make runhat command work again.
Dianne Hackborn [Wed, 26 Sep 2012 22:25:22 +0000 (15:25 -0700)]
Merge "Make runhat command work again." into jb-mr1-dev
Dianne Hackborn [Wed, 26 Sep 2012 22:00:59 +0000 (15:00 -0700)]
Make runhat command work again.
Change-Id: Ia3d2aefd32579b61da72e65c78dc6053dbaaad28
The Android Automerger [Wed, 26 Sep 2012 19:17:50 +0000 (12:17 -0700)]
JOO88B
The Android Open Source Project [Wed, 26 Sep 2012 16:05:51 +0000 (09:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I02113763b6c6dfd96cf69377e244412d647a54f4
The Android Open Source Project [Wed, 26 Sep 2012 16:02:14 +0000 (09:02 -0700)]
am
96b17f8e: (-s ours) am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:01:43 +0000 (09:01 -0700)]
am
96b17f8e: am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 16:00:24 +0000 (09:00 -0700)]
am
a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
a8a731bf7fe8d42af56c7481acd99628dd1df2f0':
JZO54I
The Android Open Source Project [Wed, 26 Sep 2012 15:58:17 +0000 (08:58 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309
The Android Automerger [Wed, 26 Sep 2012 14:01:24 +0000 (07:01 -0700)]
JOO88
The Android Automerger [Wed, 26 Sep 2012 13:59:09 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 26 Sep 2012 04:50:16 +0000 (21:50 -0700)]
JZO54I
The Android Automerger [Wed, 26 Sep 2012 03:46:44 +0000 (20:46 -0700)]
JOO87E
The Android Automerger [Wed, 26 Sep 2012 00:34:26 +0000 (17:34 -0700)]
JOO87D
The Android Automerger [Tue, 25 Sep 2012 21:43:33 +0000 (14:43 -0700)]
JOO87C
The Android Automerger [Tue, 25 Sep 2012 18:06:38 +0000 (11:06 -0700)]
JOO87B
The Android Automerger [Tue, 25 Sep 2012 18:05:45 +0000 (11:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 25 Sep 2012 14:02:05 +0000 (07:02 -0700)]
JOO87
The Android Automerger [Tue, 25 Sep 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 24 Sep 2012 23:47:29 +0000 (16:47 -0700)]
JOO86B
Bart Sears [Mon, 24 Sep 2012 20:08:21 +0000 (13:08 -0700)]
am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
0b7e0983d4dab0796fd37439859250c88142463b':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:08:14 +0000 (13:08 -0700)]
am
0b7e0983: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
* commit '
0b7e0983d4dab0796fd37439859250c88142463b':
Add the new NanumGothic makefile to the build
Bart Sears [Mon, 24 Sep 2012 20:06:06 +0000 (13:06 -0700)]
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
Siva Velusamy [Mon, 24 Sep 2012 19:49:27 +0000 (12:49 -0700)]
am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
53e714209b32599a1fe19a1827f313207e43fd52':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Mon, 24 Sep 2012 19:49:21 +0000 (12:49 -0700)]
am
53e71420: Revert "Include videoeditor_jni in sdk product build."
* commit '
53e714209b32599a1fe19a1827f313207e43fd52':
Revert "Include videoeditor_jni in sdk product build."
Siva Velusamy [Fri, 21 Sep 2012 22:23:58 +0000 (15:23 -0700)]
Revert "Include videoeditor_jni in sdk product build."
This reverts commit
997e629d6dca5683af596ba22f564b5346967b95.
The Android Open Source Project [Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb
The Android Open Source Project [Mon, 24 Sep 2012 16:29:40 +0000 (09:29 -0700)]
am
cc71f1ea: am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 15:51:29 +0000 (08:51 -0700)]
am
cc71f1ea: (-s ours) am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
JZO54H
Ying Wang [Mon, 24 Sep 2012 15:27:35 +0000 (08:27 -0700)]
am
f8f2b022: Ignore support library Proguard warning
* commit '
f8f2b022e9e6ea218d60eb692ede3e6e48c944af':
Ignore support library Proguard warning
Ying Wang [Mon, 24 Sep 2012 15:27:32 +0000 (08:27 -0700)]
am
f8f2b022: Ignore support library Proguard warning
* commit '
f8f2b022e9e6ea218d60eb692ede3e6e48c944af':
Ignore support library Proguard warning
The Android Open Source Project [Mon, 24 Sep 2012 15:26:41 +0000 (08:26 -0700)]
am
d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d50926a047d51f950cbe6c7588d4b168e0cfc3bb':
JZO54H
The Android Open Source Project [Mon, 24 Sep 2012 14:38:53 +0000 (07:38 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I41bb7c5875f0eef1fd8c31f98f628718a966eddc
The Android Automerger [Mon, 24 Sep 2012 13:59:50 +0000 (06:59 -0700)]
JOO86
The Android Automerger [Mon, 24 Sep 2012 13:59:02 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Bart Sears [Mon, 24 Sep 2012 07:11:00 +0000 (00:11 -0700)]
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
The Android Automerger [Mon, 24 Sep 2012 02:00:36 +0000 (19:00 -0700)]
JOO85B
The Android Automerger [Mon, 24 Sep 2012 01:59:34 +0000 (18:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Ying Wang [Sun, 23 Sep 2012 20:46:58 +0000 (13:46 -0700)]
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
The Android Automerger [Sun, 23 Sep 2012 13:59:48 +0000 (06:59 -0700)]
JOO85
The Android Automerger [Sun, 23 Sep 2012 13:59:04 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 16:44:00 +0000 (09:44 -0700)]
JOO84
The Android Automerger [Sat, 22 Sep 2012 16:41:22 +0000 (09:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 01:02:14 +0000 (18:02 -0700)]
JZO54H
Siva Velusamy [Sat, 22 Sep 2012 00:48:35 +0000 (17:48 -0700)]
am
32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
* commit '
32130c6d092223ba91ab4425fe2c40e9e6fde584':
Include videoeditor_jni in sdk product build.
Scott Main [Sat, 22 Sep 2012 00:48:34 +0000 (17:48 -0700)]
am
57a0a4c1: am
dcce7ca6: am
582db97b: add style for code captions; ignore sidenav headers for HRs
* commit '
57a0a4c1fe29a2fe5fea924bd87554380bc70a9a':
add style for code captions; ignore sidenav headers for HRs
The Android Automerger [Fri, 21 Sep 2012 23:26:24 +0000 (16:26 -0700)]
JOO83C
Siva Velusamy [Fri, 21 Sep 2012 21:09:57 +0000 (14:09 -0700)]
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
OSDN Git Service
