OSDN Git Service
The Android Open Source Project [Mon, 1 Jul 2013 14:44:19 +0000 (07:44 -0700)]
am
4886cf51: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
4886cf512df8ee5a0f60063b1a74ffddb20d2aa6':
"JSS01"
"JSR91"
JSR88C
"JWR66R"
JSR88B
The Android Open Source Project [Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Icaf1734bf56551758a818c0b3bbbda7a7eda0924
The Android Automerger [Mon, 1 Jul 2013 12:56:00 +0000 (05:56 -0700)]
"JSS01"
The Android Automerger [Mon, 1 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 30 Jun 2013 12:56:26 +0000 (05:56 -0700)]
"JSR91"
The Android Automerger [Sun, 30 Jun 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Fri, 28 Jun 2013 21:57:23 +0000 (14:57 -0700)]
JSR88C
The Android Automerger [Fri, 28 Jun 2013 21:36:04 +0000 (14:36 -0700)]
"JWR66R"
Ying Wang [Fri, 28 Jun 2013 20:47:15 +0000 (13:47 -0700)]
am
f755fa0d: (-s ours) am
d235ed2a: Respect DISABLE_PROGUARD
* commit '
f755fa0d8c46a907aa457c55a8164141975467da':
Respect DISABLE_PROGUARD
Ying Wang [Fri, 28 Jun 2013 20:43:25 +0000 (13:43 -0700)]
am
d235ed2a: Respect DISABLE_PROGUARD
* commit '
d235ed2afb29101cc3e03e7bb692637ad67b48ad':
Respect DISABLE_PROGUARD
Ying Wang [Fri, 28 Jun 2013 20:37:27 +0000 (13:37 -0700)]
Respect DISABLE_PROGUARD
The flag is only used by unbundled build currently.
Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
The Android Automerger [Fri, 28 Jun 2013 12:25:50 +0000 (05:25 -0700)]
JSR88B
Brian Carlstrom [Fri, 28 Jun 2013 00:34:25 +0000 (00:34 +0000)]
Merge "Move from WITH_ART to PRODUCT_RUNTIMES"
Brian Carlstrom [Thu, 27 Jun 2013 19:02:46 +0000 (12:02 -0700)]
Move from WITH_ART to PRODUCT_RUNTIMES
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
The Android Open Source Project [Thu, 27 Jun 2013 15:12:57 +0000 (08:12 -0700)]
am
92ad5881: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
92ad5881b51c6762f71ced36b2ba34f3afe5b765':
"JSR88"
The Android Open Source Project [Thu, 27 Jun 2013 15:11:38 +0000 (08:11 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664
The Android Automerger [Thu, 27 Jun 2013 12:56:02 +0000 (05:56 -0700)]
"JSR88"
The Android Automerger [Thu, 27 Jun 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Ying Wang [Thu, 27 Jun 2013 00:56:08 +0000 (17:56 -0700)]
Allow to run checkbuild in sdk build.
Bug:
9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
The Android Open Source Project [Wed, 26 Jun 2013 19:37:49 +0000 (12:37 -0700)]
am
426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7':
"JSR87"
The Android Open Source Project [Wed, 26 Jun 2013 19:33:18 +0000 (12:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: If7ea39ba97f444cd714be425a9545ba89f4ef7f2
The Android Automerger [Wed, 26 Jun 2013 19:18:19 +0000 (12:18 -0700)]
"JSR87"
The Android Automerger [Wed, 26 Jun 2013 19:17:03 +0000 (12:17 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Brian Carlstrom [Wed, 26 Jun 2013 05:30:17 +0000 (05:30 +0000)]
Merge "Add support for dualbooting dalvik and art"
Jean-Baptiste Queru [Wed, 26 Jun 2013 00:04:17 +0000 (00:04 +0000)]
Merge "Revert "Ship Music2, not Music""
The Android Open Source Project [Wed, 26 Jun 2013 00:02:15 +0000 (17:02 -0700)]
am
90aa9d84: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
90aa9d848485a9209e80b1beadecf8dd3ba3553c':
JWR66Q
"JSR85"
JSR78D
Ying Wang [Wed, 26 Jun 2013 00:01:52 +0000 (17:01 -0700)]
am
4c4b6b2a: am
f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
* commit '
4c4b6b2a0bcfe662a6954e6d63cebe4a39fc5de1':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Brian Carlstrom [Mon, 24 Jun 2013 17:16:03 +0000 (10:16 -0700)]
Add support for dualbooting dalvik and art
Change-Id: I39bc909bf9ba2c8e4dc6599c84e5a6c780def43d
Jean-Baptiste Queru [Tue, 25 Jun 2013 23:33:44 +0000 (16:33 -0700)]
Revert "Ship Music2, not Music"
This reverts commit
1ad24f57a1a3949dfc1e5bf19f661df1bd08c080.
Bug:
9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
The Android Open Source Project [Tue, 25 Jun 2013 23:10:44 +0000 (16:10 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26
The Android Automerger [Tue, 25 Jun 2013 22:11:07 +0000 (15:11 -0700)]
JWR66Q
Ying Wang [Tue, 25 Jun 2013 21:13:09 +0000 (14:13 -0700)]
am
f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
* commit '
f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Ying Wang [Tue, 25 Jun 2013 19:34:11 +0000 (12:34 -0700)]
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit
8578cab0667cf3a3da263d838e29b07060af9ba7)
Ying Wang [Tue, 25 Jun 2013 19:34:11 +0000 (12:34 -0700)]
Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.
Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
Justin Ho [Mon, 24 Jun 2013 23:21:29 +0000 (23:21 +0000)]
Merge "Ship Music2, not Music Bug:
9518830"
Justin Ho [Mon, 24 Jun 2013 23:06:11 +0000 (16:06 -0700)]
Ship Music2, not Music
Bug:
9518830
Change-Id: Ic0d696a958592e67bb3fc0580e9bd717b927d36b
Ben Cheng [Mon, 24 Jun 2013 22:02:31 +0000 (22:02 +0000)]
Merge "Source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb"
The Android Automerger [Mon, 24 Jun 2013 21:55:38 +0000 (14:55 -0700)]
"JSR85"
The Android Automerger [Mon, 24 Jun 2013 21:55:02 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:44:20 +0000 (14:44 -0700)]
JSR78D
The Android Automerger [Mon, 24 Jun 2013 21:41:25 +0000 (14:41 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
Ben Cheng [Mon, 24 Jun 2013 21:36:21 +0000 (14:36 -0700)]
Source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb
Example for future gdb scripts: A handy command "dbt" is
added to unwind the Dalvik stack.
Change-Id: I564ec865c30453879439203d9d15623d5f1ec235
The Android Automerger [Mon, 24 Jun 2013 21:34:42 +0000 (14:34 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
The Android Open Source Project [Mon, 24 Jun 2013 18:50:02 +0000 (11:50 -0700)]
am
2ca8825a: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
2ca8825aff762b5657f4f0b661bf20c7e2957c60':
JSR82B
The Android Open Source Project [Mon, 24 Jun 2013 18:44:56 +0000 (11:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846
Svetoslav Ganov [Wed, 3 Apr 2013 20:59:53 +0000 (13:59 -0700)]
Print - build
Change-Id: I640adcc41697e609ed324bd1f1dd032e20df4933
The Android Automerger [Fri, 21 Jun 2013 22:39:44 +0000 (15:39 -0700)]
JSR82B
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 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: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
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 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"
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 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
OSDN Git Service
