OSDN Git Service
Ying Wang [Fri, 12 Jul 2013 01:56:02 +0000 (18:56 -0700)]
am
a1b948af: am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
Ying Wang [Fri, 12 Jul 2013 01:52:19 +0000 (18:52 -0700)]
am
cbeb6e81: Merge "Include ping6 in all device builds"
* commit '
cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
Ying Wang [Thu, 11 Jul 2013 19:08:48 +0000 (19:08 +0000)]
Merge "Include ping6 in all device builds"
The Android Open Source Project [Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
The Android Automerger [Thu, 11 Jul 2013 12:56:15 +0000 (05:56 -0700)]
"JSS11"
The Android Automerger [Thu, 11 Jul 2013 12:55:09 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lorenzo Colitti [Thu, 11 Jul 2013 03:54:05 +0000 (12:54 +0900)]
Include ping6 in all device builds
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug:
9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
The Android Automerger [Thu, 11 Jul 2013 01:34:56 +0000 (18:34 -0700)]
"JWR66V"
The Android Open Source Project [Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944
The Android Automerger [Wed, 10 Jul 2013 12:56:05 +0000 (05:56 -0700)]
"JSS10"
The Android Automerger [Wed, 10 Jul 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 [Wed, 10 Jul 2013 00:13:04 +0000 (17:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Iefcd2a29c958299abc4cdfd7217f6f3deb7d483e
Jeff Brown [Tue, 9 Jul 2013 23:48:17 +0000 (16:48 -0700)]
am
a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '
a3d60ae86f112388c27b4a164f269efd5f6d1c72':
Revert "Remove mediarouter v7 support library from SDK."
Jeff Brown [Tue, 9 Jul 2013 23:44:40 +0000 (23:44 +0000)]
Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
The Android Automerger [Tue, 9 Jul 2013 23:38:30 +0000 (16:38 -0700)]
"JSS09B"
The Android Automerger [Tue, 9 Jul 2013 23:27:09 +0000 (16:27 -0700)]
JWR66U
The Android Open Source Project [Tue, 9 Jul 2013 16:36:30 +0000 (09:36 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9fe682604981ae07715422637fc4629d7e09937f
The Android Automerger [Tue, 9 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS09"
The Android Automerger [Tue, 9 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Dirk Dougherty [Tue, 9 Jul 2013 00:37:50 +0000 (17:37 -0700)]
am
8c01be68: am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
8c01be686cacb593677dd1a753c132e58aa87661':
Doc change: Move butterbar css to template assets.
Jeff Brown [Tue, 9 Jul 2013 00:35:00 +0000 (00:35 +0000)]
Revert "Remove mediarouter v7 support library from SDK."
This reverts commit
0eacd936b7d6dabd380ecd6f1d25d39625b37495.
Bug:
9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
Dirk Dougherty [Tue, 9 Jul 2013 00:33:58 +0000 (17:33 -0700)]
am
ccc15faf: am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
ccc15faf56ad46f973800cb6bd41b4634b9192a0':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:32:03 +0000 (17:32 -0700)]
am
56811475: am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
56811475202ededf0c76bf9b28d3e27d5761d747':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:29:54 +0000 (17:29 -0700)]
am
5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '
5386532e03bbc76bcdf8a76877ef460bfe764925':
Doc change: Move butterbar css to template assets.
Dirk Dougherty [Tue, 9 Jul 2013 00:28:40 +0000 (00:28 +0000)]
Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
Dirk Dougherty [Mon, 8 Jul 2013 23:05:05 +0000 (16:05 -0700)]
Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
Scott Main [Mon, 8 Jul 2013 22:32:53 +0000 (15:32 -0700)]
am
7672ccb3: am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
7672ccb3d7ae6153c86bdd69a48db7e87e445c27':
enable download box style for qv sidebox
The Android Open Source Project [Mon, 8 Jul 2013 22:31:01 +0000 (15:31 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifa6e38073ef648695efea3b895ef1fb64d39471e
Scott Main [Mon, 8 Jul 2013 22:28:53 +0000 (15:28 -0700)]
am
fb2bb3d8: am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:27:50 +0000 (15:27 -0700)]
am
51852a3f: am
8c0f5b3a: enable download box style for qv sidebox
* commit '
51852a3fc1120fdad1f309613439e9b42e497318':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:25:55 +0000 (15:25 -0700)]
am
8c0f5b3a: enable download box style for qv sidebox
* commit '
8c0f5b3aefac3c824155cf883e61b021a6d8fd8f':
enable download box style for qv sidebox
Scott Main [Mon, 8 Jul 2013 22:12:02 +0000 (15:12 -0700)]
enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
Lorenzo Colitti [Mon, 8 Jul 2013 21:31:05 +0000 (14:31 -0700)]
am
b1b758f5: Don\'t build clatd without clatd.conf.
* commit '
b1b758f5bf30d1c6f5b0c0d5599bbe6a91d541f9':
Don't build clatd without clatd.conf.
Lorenzo Colitti [Mon, 8 Jul 2013 10:43:42 +0000 (19:43 +0900)]
Don't build clatd without clatd.conf.
Bug:
9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
The Android Automerger [Mon, 8 Jul 2013 12:56:31 +0000 (05:56 -0700)]
"JSS08"
The Android Automerger [Mon, 8 Jul 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Wed, 3 Jul 2013 21:10:21 +0000 (14:10 -0700)]
Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I8cef01a88b58eb33c82f6f6080d43490847fc377
The Android Automerger [Wed, 3 Jul 2013 19:33:56 +0000 (12:33 -0700)]
JCR78H
The Android Open Source Project [Wed, 3 Jul 2013 14:37:08 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21
The Android Automerger [Wed, 3 Jul 2013 02:04:53 +0000 (19:04 -0700)]
JWR66T
The Android Open Source Project [Tue, 2 Jul 2013 19:33:17 +0000 (12:33 -0700)]
Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge
Change-Id: Iae120841f91c3c12600a6f993c498f292f1cf0b2
The Android Automerger [Tue, 2 Jul 2013 18:57:14 +0000 (11:57 -0700)]
JSS02B
The Android Automerger [Tue, 2 Jul 2013 12:56:01 +0000 (05:56 -0700)]
"JSS02"
The Android Automerger [Tue, 2 Jul 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 2 Jul 2013 04:19:39 +0000 (21:19 -0700)]
JCR78G
The Android Automerger [Tue, 2 Jul 2013 01:04:27 +0000 (18:04 -0700)]
"JWR66S"
The Android Automerger [Mon, 1 Jul 2013 23:57:31 +0000 (16:57 -0700)]
JCR78F
The Android Automerger [Mon, 1 Jul 2013 23:46:19 +0000 (16:46 -0700)]
JCR78E
The Android Open Source Project [Mon, 1 Jul 2013 22:59:13 +0000 (15:59 -0700)]
Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I3331bb9b846bc698339f8ce6bcf33b37d92a8074
Baligh Uddin [Mon, 1 Jul 2013 22:11:53 +0000 (15:11 -0700)]
JCR78D
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: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
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
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
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)
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
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:44:56 +0000 (11:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846
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: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: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:31:51 +0000 (17:31 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a
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:18:12 +0000 (07:18 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I36bc10874ee057cbcba8dc3d9d6c49415bfece45
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: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: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 02:10:08 +0000 (19:10 -0700)]
JWR66O
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: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
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
OSDN Git Service
