drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,932 Commits 1 Branch 0 Tags
Commit Graph

578 Commits

Author SHA1 Message Date
Scott Main
46f0ffa99b am cd79f9f0: am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit 'cd79f9f0f4a3fb3527023450839313aa67e5e106':
  docs:advmgr-updates
 2014-12-01 19:32:31 +00:00
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
 2014-11-27 10:08:51 +00:00
Scott Main
fc79307406 Merge "docs:advmgr-updates" into lmp-docs 2014-11-26 03:13:27 +00:00
Rich Slogar
0ed88b9a2e docs:advmgr-updates 
Change-Id: I4895f8dc91d0397a615a358d97cbd229b171f507
 2014-11-25 16:40:28 -08:00
Dirk Dougherty
448d1ffcad am 40343340: am ef629f1f: am a79acc03: Doc change: localized content. automerge: 4d82f8a 
automerge: 1896e58

* commit '1896e5890489842aad280402d6144d272bce6730':
  Doc change: localized content.
 2014-11-21 10:21:02 +00:00
Dirk Dougherty
403433401b am ef629f1f: am a79acc03: Doc change: localized content. 
automerge: 4d82f8a

* commit '4d82f8ad32f9caa3aff237600c4693f8907009e9':
  Doc change: localized content.
 2014-11-21 10:10:32 +00:00
Dirk Dougherty
a79acc0315 Doc change: localized content. 
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
 2014-11-19 23:44:05 +00:00
Joe Fernandez
89f48e69d2 am 465e0532: am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs 
automerge: cab3443

* commit 'cab3443fb44a32eb58a74ec5ed50b9923165e0be':
  docs:builds tools 21.1.1 update
 2014-11-11 00:06:59 +00:00
Joe Fernandez
465e053249 am 2b0b7a6c: am 3bd60359: am c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs 
* commit '2b0b7a6c2f4ec75ddb90b92e7af8362c26607495':
  docs:builds tools 21.1.1 update
 2014-11-10 23:06:46 +00:00
Joe Fernandez
c2f2a72571 Merge "docs:builds tools 21.1.1 update" into lmp-docs 2014-11-10 22:50:17 +00:00
Rich Slogar
2d8cd7cbb2 docs:builds tools 21.1.1 update 
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
 2014-11-10 09:59:15 -08:00
Rich Slogar
085c480985 am 7ac41ce3: am 1d793503: am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit '7ac41ce38c671eee784f26fe9d10c537cde3962c':
  docs:Remove tools/index.jd file.
 2014-11-07 00:24:42 +00:00
Rich Slogar
1d793503bd am d47ab00c: am 830790ba: am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs 
* commit 'd47ab00cc4f15287c8b48ed5805c4e9766facb58':
  docs:Remove tools/index.jd file.
 2014-11-07 00:05:38 +00:00
Rich Slogar
b0af6987aa Merge "docs:Remove tools/index.jd file." into lmp-docs 2014-11-06 20:30:11 +00:00
Eric Gilmore
3cde7b9801 am ffcc5657: am 9fe0017d: am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images. 
* commit 'ffcc5657b9045435983ec1f981ea8890c423ba14':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
 2014-11-05 00:39:20 +00:00
Eric Gilmore
9fe0017dd1 am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images. 
* commit '1c9860f9285709cddff2e570a50e3afc66091135':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
 2014-11-05 00:26:49 +00:00
Eric Gilmore
bf78adb25e Adding 5.0 emulator image and removing older image. 
2nd patch set includes low/high res. images.

Bug: 18026943

Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
 2014-11-04 15:01:24 -08:00
Joe Fernandez
ae59e01ccc am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references automerge: f16f6d9 
automerge: 93a954b

* commit '93a954b46b1d07bf1ca50790a62893f7bc123aeb':
  docs: multidex - building apps with over 65K method references
 2014-11-01 15:03:56 +00:00
Joe Fernandez
8511884919 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs automerge: ed47742 
automerge: 05827eb

* commit '05827eb8f77e26da75c09fbdb84bfb184f8667fd':
  docs:studio-update-814
 2014-11-01 14:58:06 +00:00
Joe Fernandez
f16f6d9ed2 am 84045506: am 20207a83: am e8ad737d: docs: multidex - building apps with over 65K method references 
* commit '84045506140d895aaf4fdc5a090e89d657add120':
  docs: multidex - building apps with over 65K method references
 2014-11-01 14:10:43 +00:00
Joe Fernandez
ed47742ff0 am 43fda072: am 922e6b6a: am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs 
* commit '43fda072c227e7a98dbcb993dc20fb391c1f11fc':
  docs:studio-update-814
 2014-11-01 14:08:18 +00:00
Joe Fernandez
e8ad737db6 docs: multidex - building apps with over 65K method references 
Change-Id: I822cdc54d0f2df34a89d5294ff7ea1f5f83b25f9
 2014-10-31 17:38:49 -07:00
Yorke Lee
14deca6ded am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev 
automerge: 2eaf0b0

* commit '2eaf0b0a7b86304a739f91033e9f8f053123e74d':
  Fix typo in activity_testing.jd
 2014-10-31 18:45:18 +00:00
Rich Slogar
96b245acf0 docs:studio-update-814 
Change-Id: Ie20289d8ddeb9bace07f05fa79e89e9b850fa0b1
 2014-10-30 17:31:33 -07:00
Yorke Lee
3df06ddd33 Fix typo in activity_testing.jd 
UIThreadTest -> UiThreadTest
Change-Id: I32e8303b13c6631f12c974d464ec16f9dfca7071
 2014-10-28 15:18:00 -07:00
Rich Slogar
6adfbddd57 docs:Remove tools/index.jd file. 
Change-Id: I42306e57981f4866e17f2972e8809cc158cbd84f
 2014-10-27 19:37:28 +00:00
Joe Fernandez
752088e84c am f5fe0816: am 3ef1c95b: am 65dca4ec: am abb8ea3d: am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit 'f5fe0816122d1c7b678f897f70f7708d0f363faf':
  docs:Added 64-bit image note from Preview page
 2014-10-24 23:39:34 +00:00
Joe Fernandez
abb8ea3d4b am 90f734eb: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 
* commit '90f734eb180619eb8ffd2e30580f72b500184f8b':
  docs:Added 64-bit image note from Preview page
 2014-10-24 22:37:16 +00:00
Joe Fernandez
3909359df3 am 34e4bcfa: am 469413bd: am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '34e4bcfa7b21f5410d19af03aaecfd0337ba4c97':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:50:45 +00:00
Joe Fernandez
d8c5b0e773 am 95ddc11b: am 20665087: am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '95ddc11bb7b783efa353a7cbe45e3a084f8d8061':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:45:11 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Ricardo Cervera
8ead5df0c3 am 9c36848d: am 713869b2: am ce3d72e4: am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '9c36848da68cfe6c70b799c6b1db1266a86577f4':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 22:02:43 +00:00
Joe Fernandez
d969f022b6 am 9d98894a: am 3f16106c: am ac0e00db: am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit '9d98894a8d7f8b235fe9026956ee5b04bab0aa61':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 15:59:48 +00:00
Rich Slogar
883c7ee745 am 145016f3: am 9ba1d92c: am 1e44dc18: am cb79d086: docs:Update 4.4W for Wear GPS suppport 
* commit '145016f375efe8fe1e4744adb164df93696ae487':
  docs:Update 4.4W for Wear GPS suppport
 2014-10-23 15:58:22 +00:00
Ricardo Cervera
8755d9a536 Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 2014-10-23 15:10:09 +00:00
Rich Slogar
b3ae31ac1f docs:Build tools revisions 21.01 and 21.02 
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
 2014-10-22 17:30:07 -07:00
Rich Slogar
cb79d08666 docs:Update 4.4W for Wear GPS suppport 
Change-Id: I1fc5699c84d2c29b26730a949858f9cd6eba4bbe
 2014-10-22 15:23:15 -07:00
Ricardo Cervera
f08c488b19 docs: Fixed 404 link in SDK Tools page. 
Bug: 17950558

Change-Id: Ibd110b6aa693b4f5f4c8ca46efdb2c32a88f3dd2
 2014-10-21 10:18:19 -07:00
Ricardo Cervera
2102ac1eed docs: Fix hprof-conv location in docs. 
https://code.google.com/p/android/issues/detail?id=76691

Change-Id: I8550731c1defe867d26d5ab4568c4935c89e37d6
 2014-10-21 10:12:08 -07:00
Ricardo Cervera
b8cad71b39 docs: Updating dependency vers nums for support libs. 
Change-Id: I1b9ce98b8ccccc42790af913a49c27e73610fd50
 2014-10-20 15:00:19 -07:00
David Friedman
9d099067f3 am 5ac64f0d: am 30be8be4: am 981c97ec: am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
* commit '5ac64f0d860d4b5f682557a48547437f9ec7ac01':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 19:09:36 +00:00
David Friedman
597d386129 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 2014-10-17 04:30:29 +00:00
David Friedman
2fe086c21f NDK-r10c release notes (change log) for publication to NDK page on DAC. 
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
 2014-10-16 21:18:03 -07:00
Andrew Solovay
4d07538f40 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev automerge: f029a41 
automerge: b995dbc

* commit 'b995dbcbb3e7d7e8fe1aac8e98c016b4ab746c51':
  docs: Updating support library pages for v.21.
 2014-10-17 01:15:14 +00:00
Andrew Solovay
6b53fb6227 Merge "docs: Updating support library pages for v.21." into lmp-dev 2014-10-16 21:10:20 +00:00
Rich Slogar
87e144de8e am fbe9a6af: am 18535b07: am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit 'fbe9a6affc47b7d32e55a347001c2ed4cedc5f31':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 21:00:45 +00:00
Rich Slogar
9d2a9772e9 am 436d4df6: am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev automerge: 6b1edcd 
* commit '436d4df6433e444fa08ec8258f48187e67018dda':
  docs:Build and Platform Tools Updates for Android 5
 2014-10-16 19:16:20 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates 
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
 2014-10-16 12:07:35 -07:00