Commit Graph

13105 Commits

Author SHA1 Message Date
The Android Automerger bbb986b22d JSR88B 2013-06-28 05:25:50 -07:00
The Android Open Source Project 92ad5881b5 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ib2d247987e12acb692ade4862ebe200585bb4664
2013-06-27 08:11:38 -07:00
The Android Automerger 3963f3cbe0 "JSR88" 2013-06-27 05:56:02 -07:00
The Android Automerger 203a5ed738 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-27 05:55:09 -07:00
The Android Open Source Project 426bf5adf0 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: If7ea39ba97f444cd714be425a9545ba89f4ef7f2
2013-06-26 12:33:18 -07:00
The Android Automerger 69fb023e61 "JSR87" 2013-06-26 12:18:19 -07:00
The Android Automerger 74d23ec41e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-26 12:17:03 -07:00
The Android Open Source Project 90aa9d8484 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ibbe777e000d41acd338e396199bb93e652b38d26
2013-06-25 16:10:44 -07:00
The Android Automerger 627c2b2fcb JWR66Q 2013-06-25 15:11:07 -07:00
Ying Wang 4c4b6b2a0b am f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
  Fix use of LOCAL_CLASSPATH in droiddoc.mk
2013-06-25 14:13:09 -07:00
Ying Wang f84bf8d0ca 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 8578cab066)
2013-06-25 21:05:11 +00:00
The Android Automerger d829e5c450 "JSR85" 2013-06-24 14:55:38 -07:00
The Android Automerger 1713bf7170 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-24 14:55:02 -07:00
The Android Automerger 4027d0ebbd JSR78D 2013-06-24 14:44:20 -07:00
The Android Automerger 0fec6c3d4e Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:41:25 -07:00
The Android Automerger 0823a134fe Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD 2013-06-24 14:34:42 -07:00
The Android Open Source Project 2ca8825aff Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I96ddc0a7186ed26fd445bc47a16c7c03a3d7c846
2013-06-24 11:44:56 -07:00
The Android Automerger 5c59dc6798 JSR82B 2013-06-21 15:39:44 -07:00
The Android Open Source Project 70b89b2bb9 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af
2013-06-21 11:56:38 -07:00
The Android Automerger 3b1ec02875 "JSR82" 2013-06-21 11:37:27 -07:00
The Android Automerger 85405f72d1 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-21 11:35:04 -07:00
Ying Wang c012edbc51 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
2013-06-21 10:42:32 -07:00
Ying Wang 42aaacf183 am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores"
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
  Do not use -msynci flag for Xburst 4780 cores
2013-06-21 10:37:38 -07:00
Ying Wang a90d7eb64f Merge "Do not use -msynci flag for Xburst 4780 cores" 2013-06-21 17:35:51 +00:00
The Android Open Source Project 63ddacee4d Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I5ed80e588eaaed9872e22aa2c0a362723a698f3a
2013-06-20 17:31:51 -07:00
Raghu Gandham 6faf71647a 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>
2013-06-20 13:29:49 -07:00
The Android Automerger 2f47c8f74f JWR66P 2013-06-20 12:19:28 -07:00
The Android Automerger 519720ddf0 JSR78C 2013-06-20 11:22:47 -07:00
The Android Open Source Project 3d828aa727 Reconcile with jb-mr2-release - do not merge
Change-Id: I36bc10874ee057cbcba8dc3d9d6c49415bfece45
2013-06-20 07:18:12 -07:00
Scott Main 7913082512 am cef39240: align sidebox with content body
* commit 'cef39240fbdfb298a4ff4061bce835c001a4765d':
  align sidebox with content body
2013-06-19 20:34:56 -07:00
Scott Main cef39240fb align sidebox with content body
Change-Id: Id6cd8cdd1b21b8ceda2a6931bb69f096c0d6deb1
2013-06-19 20:29:47 -07:00
Scott Main e608723a92 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
2013-06-19 20:20:26 -07:00
Scott Main d19c2c82c1 update design/develop link icons to 2x for high res display
Change-Id: I09560c395088e0f8d835199a6eb4267af50bddaa
2013-06-19 18:48:27 -07:00
Scott Main 20a047b8b0 am aaf7664d: add style for links to Design docs from developer docs
* commit 'aaf7664d889f9445b638e530aa050fb02099eb16':
  add style for links to Design docs from developer docs
2013-06-19 18:47:39 -07:00
Scott Main aaf7664d88 add style for links to Design docs from developer docs
Change-Id: I0f7e561c98277fb1b6b9c0b95a2ed7eef890c6db
2013-06-19 18:39:16 -07:00
The Android Automerger be90175360 JWR66O 2013-06-18 19:10:08 -07:00
The Android Open Source Project 9bc8a1b206 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I46c5b91eef4f2fbf03929d2eb92d37cd10f6377c
2013-06-18 11:50:29 -07:00
The Android Automerger d41113f6ba "JSR78B" 2013-06-18 11:32:52 -07:00
Scott Main e721f9df24 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
2013-06-17 15:31:15 -07:00
Scott Main d7026f7a5f 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
2013-06-17 15:09:57 -07:00
The Android Open Source Project f0db596275 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I648e611890e12e68d1be949fe474a2a5e19200a4
2013-06-17 07:31:38 -07:00
The Android Automerger d48861fdbb "JSR78" 2013-06-17 05:55:31 -07:00
The Android Automerger 41d8cfce96 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-17 05:55:05 -07:00
The Android Open Source Project c5ffd94171 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I676e94de2cbbc9941fe4a895a55b2d5325babb88
2013-06-16 07:43:37 -07:00
The Android Automerger 256d71560c "JSR77" 2013-06-16 05:56:42 -07:00
The Android Automerger 82743115e3 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-16 05:55:16 -07:00
Jeff Brown 92081e6efc Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-15 12:19:44 -07:00
The Android Automerger 310c2d31aa JWR66N 2013-06-15 12:18:10 -07:00
Jeff Brown bd1c3a2112 am 0eacd936: Remove mediarouter v7 support library from SDK.
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
  Remove mediarouter v7 support library from SDK.
2013-06-14 16:42:09 -07:00
Jeff Brown 0eacd936b7 Remove mediarouter v7 support library from SDK.
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
2013-06-14 15:46:29 -07:00