OSDN Git Service
The Android Automerger [Tue, 25 Jun 2013 02:00:53 +0000 (19:00 -0700)]
KRR85C
Justin Ho [Mon, 24 Jun 2013 23:06:11 +0000 (16:06 -0700)]
Ship Music2, not Music
Bug:
9518830
Change-Id: Ic0d696a958592e67bb3fc0580e9bd717b927d36b
The Android Automerger [Tue, 25 Jun 2013 00:37:28 +0000 (17:37 -0700)]
"KRR85B"
The Android Automerger [Mon, 24 Jun 2013 16:47:56 +0000 (09:47 -0700)]
"KRR85"
The Android Automerger [Mon, 24 Jun 2013 16:44:30 +0000 (09:44 -0700)]
merge in klp-release history after reset to master
The Android Open Source Project [Fri, 21 Jun 2013 18:58:19 +0000 (11:58 -0700)]
am
70b89b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
70b89b2bb95022a182437996697cce7c15e6d8a7':
"JSR82"
The Android Open Source Project [Fri, 21 Jun 2013 18:56:38 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af
The Android Automerger [Fri, 21 Jun 2013 18:37:27 +0000 (11:37 -0700)]
"JSR82"
The Android Automerger [Fri, 21 Jun 2013 18:35:04 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Fri, 21 Jun 2013 17:44:47 +0000 (10:44 -0700)]
am
c012edbc: am
42aaacf1: am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
c012edbc519b74456530c26719133f96d4574de3':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:42:32 +0000 (10:42 -0700)]
am
42aaacf1: am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:37:38 +0000 (10:37 -0700)]
am
a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit '
a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
Do not use -msynci flag for Xburst 4780 cores
Ying Wang [Fri, 21 Jun 2013 17:35:50 +0000 (17:35 +0000)]
Merge "Do not use -msynci flag for Xburst 4780 cores"
The Android Open Source Project [Fri, 21 Jun 2013 00:34:07 +0000 (17:34 -0700)]
am
63ddacee: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
63ddacee4d068bf243104ceb3031dc15987eda90':
JWR66P
JSR78C
The Android Automerger [Fri, 21 Jun 2013 00:31:54 +0000 (17:31 -0700)]
KRR80E
The Android Open Source Project [Fri, 21 Jun 2013 00:31:51 +0000 (17:31 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a
Brian Carlstrom [Thu, 20 Jun 2013 23:54:20 +0000 (23:54 +0000)]
Merge "Add WITH_ART support to product definitions"
Raghu Gandham [Thu, 13 Jun 2013 21:54:55 +0000 (14:54 -0700)]
Do not use -msynci flag for Xburst 4780 cores
synci does not provide coherency between CPU's on this device
Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
The Android Automerger [Thu, 20 Jun 2013 19:19:28 +0000 (12:19 -0700)]
JWR66P
The Android Automerger [Thu, 20 Jun 2013 18:45:32 +0000 (11:45 -0700)]
KRR80D
The Android Automerger [Thu, 20 Jun 2013 18:22:47 +0000 (11:22 -0700)]
JSR78C
The Android Open Source Project [Thu, 20 Jun 2013 14:20:13 +0000 (07:20 -0700)]
am
3d828aa7: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
3d828aa727a1127c28c1a535aebceb3af992f569':
JWR66O
The Android Open Source Project [Thu, 20 Jun 2013 14:18:12 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I36bc10874ee057cbcba8dc3d9d6c49415bfece45
Scott Main [Thu, 20 Jun 2013 03:36:20 +0000 (20:36 -0700)]
am
79130825: am
cef39240: align sidebox with content body
* commit '
791308251247538bbeec8e1f10caff11ba8b5f48':
align sidebox with content body
Scott Main [Thu, 20 Jun 2013 03:34:56 +0000 (20:34 -0700)]
am
cef39240: align sidebox with content body
* commit '
cef39240fbdfb298a4ff4061bce835c001a4765d':
align sidebox with content body
Scott Main [Thu, 20 Jun 2013 03:25:34 +0000 (20:25 -0700)]
align sidebox with content body
Change-Id: Id6cd8cdd1b21b8ceda2a6931bb69f096c0d6deb1
Scott Main [Thu, 20 Jun 2013 03:22:50 +0000 (20:22 -0700)]
am
e608723a: am
d19c2c82: update design/develop link icons to 2x for high res display
* commit '
e608723a927384baadeb09a575c387a6a0e00b47':
update design/develop link icons to 2x for high res display
Scott Main [Thu, 20 Jun 2013 03:20:26 +0000 (20:20 -0700)]
am
d19c2c82: update design/develop link icons to 2x for high res display
* commit '
d19c2c82c1d79a1c556548d67ea48721b69bc277':
update design/develop link icons to 2x for high res display
Scott Main [Thu, 20 Jun 2013 01:49:52 +0000 (18:49 -0700)]
am
20a047b8: am
aaf7664d: add style for links to Design docs from developer docs
* commit '
20a047b8b0585e09d661ee459352e5404e0eda7d':
add style for links to Design docs from developer docs
Scott Main [Thu, 20 Jun 2013 01:48:27 +0000 (18:48 -0700)]
update design/develop link icons to 2x for high res display
Change-Id: I09560c395088e0f8d835199a6eb4267af50bddaa
Scott Main [Thu, 20 Jun 2013 01:47:39 +0000 (18:47 -0700)]
am
aaf7664d: add style for links to Design docs from developer docs
* commit '
aaf7664d889f9445b638e530aa050fb02099eb16':
add style for links to Design docs from developer docs
Scott Main [Thu, 20 Jun 2013 01:04:30 +0000 (18:04 -0700)]
add style for links to Design docs from developer docs
Change-Id: I0f7e561c98277fb1b6b9c0b95a2ed7eef890c6db
The Android Automerger [Wed, 19 Jun 2013 23:08:59 +0000 (16:08 -0700)]
KRR80C
Brian Carlstrom [Wed, 19 Jun 2013 22:10:33 +0000 (15:10 -0700)]
Add WITH_ART support to product definitions
Change-Id: I71f0fad07ebed73f4f69cb8c37eb1c4f88c1a9b0
The Android Automerger [Wed, 19 Jun 2013 18:00:00 +0000 (11:00 -0700)]
KRR80B
The Android Automerger [Wed, 19 Jun 2013 14:41:18 +0000 (07:41 -0700)]
"KRR80"
The Android Automerger [Wed, 19 Jun 2013 14:40:48 +0000 (07:40 -0700)]
merge in klp-release history after reset to master
The Android Automerger [Wed, 19 Jun 2013 02:10:08 +0000 (19:10 -0700)]
JWR66O
The Android Open Source Project [Tue, 18 Jun 2013 18:51:23 +0000 (11:51 -0700)]
am
9bc8a1b2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
9bc8a1b206dcd1ebba2738778ba32d25524a4f4b':
"JSR78B"
The Android Open Source Project [Tue, 18 Jun 2013 18:50:29 +0000 (11:50 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I46c5b91eef4f2fbf03929d2eb92d37cd10f6377c
The Android Automerger [Tue, 18 Jun 2013 18:32:52 +0000 (11:32 -0700)]
"JSR78B"
The Android Automerger [Tue, 18 Jun 2013 14:51:54 +0000 (07:51 -0700)]
"AAR79"
The Android Automerger [Tue, 18 Jun 2013 14:49:20 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Automerger [Mon, 17 Jun 2013 23:14:06 +0000 (16:14 -0700)]
AAR78B
Scott Main [Mon, 17 Jun 2013 22:32:59 +0000 (15:32 -0700)]
am
e721f9df: am
d7026f7a: add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
* commit '
e721f9df243534ca4b414641c109db3a24d36357':
add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Scott Main [Mon, 17 Jun 2013 22:31:15 +0000 (15:31 -0700)]
am
d7026f7a: add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
* commit '
d7026f7a5f2250246d1441e1474ff9393fe5218d':
add new script to toggle visibility of nested list items. call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Scott Main [Mon, 17 Jun 2013 22:08:49 +0000 (15:08 -0700)]
add new script to toggle visibility of nested list items.
call hideNestedItems(), giving it the parent list to toggle and the <a> element that performs the toggle
Change-Id: I6f1ee74b957f88c23550145c6ed057d8e7797c99
Christopher Tate [Mon, 17 Jun 2013 21:27:03 +0000 (14:27 -0700)]
Clean up /system/app -> /system/priv-app in incremental builds
Change-Id: Ib5596532e042e11cb1227d8a33367d24a3163431
The Android Automerger [Mon, 17 Jun 2013 14:54:23 +0000 (07:54 -0700)]
"AAR78"
The Android Automerger [Mon, 17 Jun 2013 14:49:48 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Mon, 17 Jun 2013 14:33:32 +0000 (07:33 -0700)]
am
f0db5962: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f0db59627543ef0ae918039870de5583f5e475c9':
"JSR78"
The Android Open Source Project [Mon, 17 Jun 2013 14:31:38 +0000 (07:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I648e611890e12e68d1be949fe474a2a5e19200a4
The Android Automerger [Mon, 17 Jun 2013 12:55:31 +0000 (05:55 -0700)]
"JSR78"
The Android Automerger [Mon, 17 Jun 2013 12:55:05 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Sun, 16 Jun 2013 14:45:35 +0000 (07:45 -0700)]
am
c5ffd941: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
c5ffd941710d24a59dd12608e3fc152510e70668':
"JSR77"
Remove mediarouter v7 support library from SDK.
JWR66N
The Android Open Source Project [Sun, 16 Jun 2013 14:43:37 +0000 (07:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88
The Android Automerger [Sun, 16 Jun 2013 12:56:42 +0000 (05:56 -0700)]
"JSR77"
The Android Automerger [Sun, 16 Jun 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jeff Brown [Fri, 14 Jun 2013 22:46:29 +0000 (15:46 -0700)]
Remove mediarouter v7 support library from SDK.
Bug:
9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
The Android Automerger [Sat, 15 Jun 2013 19:18:10 +0000 (12:18 -0700)]
JWR66N
Jeff Brown [Fri, 14 Jun 2013 23:43:23 +0000 (16:43 -0700)]
am
bd1c3a21: am
0eacd936: Remove mediarouter v7 support library from SDK.
* commit '
bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
Remove mediarouter v7 support library from SDK.
Jeff Brown [Fri, 14 Jun 2013 23:42:09 +0000 (16:42 -0700)]
am
0eacd936: Remove mediarouter v7 support library from SDK.
* commit '
0eacd936b7d6dabd380ecd6f1d25d39625b37495':
Remove mediarouter v7 support library from SDK.
Jeff Brown [Fri, 14 Jun 2013 22:46:29 +0000 (15:46 -0700)]
Remove mediarouter v7 support library from SDK.
Bug:
9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
The Android Open Source Project [Fri, 14 Jun 2013 19:37:53 +0000 (12:37 -0700)]
am
9bfdf4d5: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9bfdf4d539d011f0be59370d61dcbf257b3ae578':
JWR66M
The Android Open Source Project [Fri, 14 Jun 2013 19:32:53 +0000 (12:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef
Mike Lockwood [Fri, 14 Jun 2013 17:52:50 +0000 (10:52 -0700)]
Add support for WITHOUT_CLANG
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
The Android Automerger [Fri, 14 Jun 2013 00:11:13 +0000 (17:11 -0700)]
JWR66M
The Android Open Source Project [Thu, 13 Jun 2013 15:25:36 +0000 (08:25 -0700)]
am
1e6cb5a8: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
1e6cb5a8f26420bf94c6bc194d95002d9366caa4':
"JSR74"
JWR66L
JWR66K
The Android Open Source Project [Thu, 13 Jun 2013 15:22:30 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I986e60e5558ca20ee361e768c46692bbbfc46237
The Android Automerger [Thu, 13 Jun 2013 12:56:10 +0000 (05:56 -0700)]
"JSR74"
The Android Automerger [Thu, 13 Jun 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 13 Jun 2013 06:25:14 +0000 (23:25 -0700)]
JWR66L
The Android Automerger [Thu, 13 Jun 2013 03:52:33 +0000 (20:52 -0700)]
JWR66K
The Android Open Source Project [Thu, 13 Jun 2013 01:06:07 +0000 (18:06 -0700)]
am
d8ef19b0: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
d8ef19b0c8a57daea726ad93edbbe396b9e9f5d3':
JWR66J
JWR66I
The Android Open Source Project [Thu, 13 Jun 2013 01:03:58 +0000 (18:03 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I3dff434f8e95a5c15b4ef4bca3c05bdfa163df0e
The Android Automerger [Thu, 13 Jun 2013 00:06:04 +0000 (17:06 -0700)]
JWR66J
Ying Wang [Wed, 12 Jun 2013 22:41:57 +0000 (15:41 -0700)]
am
fe365531: am
1e1241ce: Dist static Java library modules.
* commit '
fe365531b0ee363640fb50d5a230c0b999fbbe4d':
Dist static Java library modules.
Ying Wang [Wed, 12 Jun 2013 22:38:05 +0000 (15:38 -0700)]
am
1e1241ce: Dist static Java library modules.
* commit '
1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
Dist static Java library modules.
Ying Wang [Wed, 12 Jun 2013 22:25:23 +0000 (15:25 -0700)]
Dist static Java library modules.
With this change, we can build and dist static jar files, as well as
apks.
Bug:
9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
The Android Automerger [Wed, 12 Jun 2013 21:26:14 +0000 (14:26 -0700)]
JWR66I
Ying Wang [Wed, 12 Jun 2013 18:12:04 +0000 (11:12 -0700)]
am
8f586805: am
38cdd442: Tweak proguard flags in the 2 files.
* commit '
8f5868057c6c84760e8419792b0009cb1d133861':
Tweak proguard flags in the 2 files.
Ying Wang [Wed, 12 Jun 2013 18:09:33 +0000 (11:09 -0700)]
am
38cdd442: Tweak proguard flags in the 2 files.
* commit '
38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
Tweak proguard flags in the 2 files.
Ying Wang [Thu, 30 May 2013 17:45:46 +0000 (10:45 -0700)]
Tweak proguard flags in the 2 files.
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug:
9203442
Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
The Android Automerger [Wed, 12 Jun 2013 14:53:38 +0000 (07:53 -0700)]
"AAR73"
The Android Automerger [Wed, 12 Jun 2013 14:49:40 +0000 (07:49 -0700)]
merge in master-release history after reset to master
The Android Open Source Project [Wed, 12 Jun 2013 14:26:01 +0000 (07:26 -0700)]
am
8870070d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
8870070d426f910cc223b3ea4f2f33a1c477014a':
"JSR73"
JWR66H
The Android Open Source Project [Wed, 12 Jun 2013 14:23:10 +0000 (07:23 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9f012993eb7dccac74fec611f0ea1c8dcd71d93f
The Android Automerger [Wed, 12 Jun 2013 12:56:41 +0000 (05:56 -0700)]
"JSR73"
The Android Automerger [Wed, 12 Jun 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 12 Jun 2013 00:39:53 +0000 (17:39 -0700)]
JWR66H
The Android Open Source Project [Tue, 11 Jun 2013 22:37:02 +0000 (15:37 -0700)]
am
31b161ce: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
31b161cedce884cb7a1426f810d4e1cba9d33f46':
"JSR72"
The Android Automerger [Tue, 11 Jun 2013 22:06:32 +0000 (15:06 -0700)]
AAR72B
The Android Open Source Project [Tue, 11 Jun 2013 21:56:39 +0000 (14:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692
The Android Automerger [Tue, 11 Jun 2013 14:53:12 +0000 (07:53 -0700)]
"AAR72"
The Android Automerger [Tue, 11 Jun 2013 14:49:18 +0000 (07:49 -0700)]
merge in master-release history after reset to master
Torne (Richard Coles) [Tue, 11 Jun 2013 13:13:45 +0000 (13:13 +0000)]
Merge "Add webviewchromium to the preopt jar list."
The Android Automerger [Tue, 11 Jun 2013 12:56:01 +0000 (05:56 -0700)]
"JSR72"
The Android Automerger [Tue, 11 Jun 2013 12:55:07 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 11 Jun 2013 01:21:08 +0000 (18:21 -0700)]
am
63452300: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
6345230095ac4ac7eb45c71caccd5a4b02942a8e':
JWR66G
JWR66F
JWR66E
The Android Open Source Project [Tue, 11 Jun 2013 01:19:13 +0000 (18:19 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9644ec405e9bd0ce498ab424f5f38cf2920ea1d6