Commit graph

10130 commits

Author SHA1 Message Date
The Android Automerger
4445685f45 JOP01 2012-10-01 07:00:00 -07:00
The Android Automerger
affe7b4952 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-01 06:59:05 -07:00
The Android Automerger
aa105d816a JOO92B 2012-09-30 18:18:26 -07:00
The Android Automerger
785bbdf40d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 18:17:21 -07:00
The Android Automerger
d58fb4f4c0 JOO92 2012-09-30 07:01:34 -07:00
The Android Automerger
9033a9d428 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 06:59:16 -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 Automerger
c088beb3d4 JOO90B 2012-09-28 14:17:39 -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
The Android Automerger
97925711d7 JOO90 2012-09-28 07:01:05 -07:00
The Android Automerger
50cef4f130 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-28 06:59:04 -07:00
The Android Automerger
d30b099ec6 JOO89C 2012-09-27 22:57:13 -07:00
The Android Automerger
8d1730d62b JOO89B 2012-09-27 17:29:30 -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
The Android Automerger
edf8e122dd JOO89 2012-09-27 07:01:47 -07:00
The Android Automerger
734d40617e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 06:59:14 -07:00
The Android Automerger
68948a94ec JOO88C 2012-09-26 18:38:33 -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 Automerger
055d8804e7 JOO88B 2012-09-26 12:17:50 -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
366e37636f JOO88 2012-09-26 07:01:24 -07:00
The Android Automerger
db4b4deaac merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 06:59:09 -07:00
The Android Automerger
ba7bed7552 JZO54I 2012-09-25 21:50:16 -07:00
The Android Automerger
2d42874f26 JOO87E 2012-09-25 20:46:44 -07:00
The Android Automerger
4aea0ed770 JOO87D 2012-09-25 17:34:26 -07:00
The Android Automerger
7e6e7d85d4 JOO87C 2012-09-25 14:43:33 -07:00
The Android Automerger
d6c869beb9 JOO87B 2012-09-25 11:06:38 -07:00
The Android Automerger
95ea2465e1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 11:05:45 -07:00
The Android Automerger
e128d8d9bd JOO87 2012-09-25 07:02:05 -07:00
The Android Automerger
12c00968a3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 06:59:14 -07:00
The Android Automerger
00a95f3b9a JOO86B 2012-09-24 16:47:29 -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
The Android Automerger
6554982614 JOO86 2012-09-24 06:59:50 -07:00
The Android Automerger
89e87cca0d merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-24 06:59:02 -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
The Android Automerger
1601c69db8 JOO85B 2012-09-23 19:00:36 -07:00
The Android Automerger
ebfd60e107 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 18:59:34 -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
6be506fb58 JOO85 2012-09-23 06:59:48 -07:00
The Android Automerger
0a7f5a7973 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 06:59:04 -07:00