drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,949 Commits 1 Branch 0 Tags
3676cbb61a
Commit Graph

4389 Commits

Author SHA1 Message Date
Elliott Hughes
70347e8352 am 8d4d4cf2: Merge "Remove obsolete traceview file format documentation." 
* commit '8d4d4cf283d12821caba321204759f2ce3fd210a':
  Remove obsolete traceview file format documentation.
 2013-02-25 15:30:58 -08:00
Joe Malin
0c7d1abaae am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'b8df147c59381cc66b5acd3718aa3fc1eaa851b6':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:37:15 -08:00
Joe Malin
cfb153b146 am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:32:22 -08:00
Joe Malin
06764394eb Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 2013-02-25 19:29:06 +00:00
Scott Main
c4bed52910 am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit '93b4fcf44bc9ff3ea3359382fb4ba4e2da6a73c8':
  docs: add google io registration announcement to home page
 2013-02-25 10:44:16 -08:00
Scott Main
b38066bb22 am d51eebae: docs: add google io registration announcement to home page 
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
  docs: add google io registration announcement to home page
 2013-02-25 10:40:34 -08:00
Scott Main
d51eebae6d docs: add google io registration announcement to home page 
Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42
 2013-02-25 10:36:03 -08:00
Joe Fernandez
1f954f2fee am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit 'd5f87129757814e7fa83739afb921fe42d9e7454':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:22:43 -08:00
Joe Malin
43f81181bc Bug 8261430: Typo in Notifications 
Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810
 2013-02-25 10:20:29 -08:00
Joe Fernandez
9faf06644d Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 2013-02-25 18:10:54 +00:00
Elliott Hughes
dbc3c407ae Remove obsolete traceview file format documentation. 
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
 2013-02-22 21:21:03 -08:00
Dirk Dougherty
ce7533d24f am a4ebda27: am 380d571a: am dc591c0b: am f15b0908: Merge "fix javadocs" into jb-mr1-dev 
* commit 'a4ebda27c9c4c6383520b07d4130b02f0564da27':
  fix javadocs
 2013-02-22 13:48:02 -08:00
Robert Ly
894174b4b0 fix javadocs 
Change-Id: Iba5344980ecaaff5efcc60f8515af23957b64687
 2013-02-22 13:32:43 -08:00
Dirk Dougherty
531a599660 am 82f810f3: am bc1a863f: am 094023a7: am 47dae077: Doc change: Update DC image, fix typo. 
* commit '82f810f3d4e70c264cb81c0cb6caaec2e864ebd0':
  Doc change: Update DC image, fix typo.
 2013-02-22 10:15:52 -08:00
Dirk Dougherty
47dae0771c Doc change: Update DC image, fix typo. 
Change-Id: Ifa68c9dd457cc8deb65e63cac54082ce082fa18d
 2013-02-22 09:54:45 -08:00
Dirk Dougherty
aca4a7760a Doc change: Remove refs to Copy Protection and note EOL in GP. 
Change-Id: Ia03a6173cc635a5de460cd5534c454840510b33d

Bug:6951537
 2013-02-21 15:47:43 -08:00
Dirk Dougherty
959256498a am 9de13839: am d886d128: am efa92b0b: am f32cbc3d: Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
* commit '9de1383960314eed43c4df1c0bcc82cd883bd76f':
  Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing.
 2013-02-21 14:29:33 -08:00
Dirk Dougherty
f32cbc3d49 Doc Change. Update docs to remove "Preview" from dev console, update screenshots, change key info for licensing/billing. 
bug: 8033647
bug: 8033688

Change-Id: Id7b5efd48f8e13ba8c8f4ab0e0f8e5dc736b1691
 2013-02-21 13:29:07 -08:00
Scott Main
09ee121c27 am 7c3e0dcc: am b5261bfe: am 36c14ef8: am 488c81ae: docs: add note about javascript interface to 4.2 overview 
* commit '7c3e0dcc7d395430e72b6786b715a530d8b5db4d':
  docs: add note about javascript interface to 4.2 overview
 2013-02-20 16:53:10 -08:00
Scott Main
488c81aebb docs: add note about javascript interface to 4.2 overview 
Change-Id: I19454c481061b27197399d63abc466810b9e1ff8
 2013-02-20 16:10:32 -08:00
Scott Main
bedf5b35eb am c1fd3ca5: am ad7b70b6: am 41ae4d7e: am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit 'c1fd3ca5cc876110688ee32675e8cac7c5b5eae6':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:38:38 -08:00
Joe Fernandez
02c78194cc docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes 
formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f

Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780
 2013-02-20 13:30:53 -08:00
Scott Main
e61116b9a1 update dev console language for new site design. 
Language only; no screenshot changes.
bug: 8032875
bug: 8033647
bug: 8033688

Change-Id: Ia333846e89d025b1edc919a40cb2224b04deb9ab
 2013-02-20 13:30:35 -08:00
Scott Main
1998060f69 am 803a6b0d: am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit '803a6b0da037e6ae6eaf51712cde5545ab140dce':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 12:03:42 -08:00
Scott Main
9dbb0b3597 docs: sanitize input for badge generator 
bug: 8002240

Change-Id: Ic1429284fd1953fb6819110ecb47fcb3a79a9600
 2013-02-19 11:51:37 -08:00
Dirk Dougherty
5fce0c1fe3 am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:11:25 -08:00
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Dirk Dougherty
f16de3f3f6 am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:09:16 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch. 
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
 2013-02-14 11:47:36 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Joe Fernandez
9b0aa6c906 am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '35390a7943b1a2826a95d6a2fe309089e04dd988':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:33:39 -08:00
Joe Fernandez
9d95873de1 Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 2013-02-13 23:24:10 +00:00
Scott Main
f796c27933 am e526eedb: am 1f6dbc0d: am c6608215: am d51a894a: docs: fix tools sidenav for offline docs 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'e526eedb8e0145f96991219abd9022ef52f4b976':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:17:02 -08:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Joe Fernandez
b80012e35c docs: SDK r21.1 - fix download links, Issue 8193979 
Change-Id: Iabbbb030d50390021feab478812140158cdfd104
 2013-02-13 14:51:59 -08:00
Scott Main
1214e975d6 am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
  docs: add info about secure adb
 2013-02-13 10:10:08 -08:00
Scott Main
dd8b58457c Merge "docs: add info about secure adb" into jb-mr1-dev 2013-02-13 18:01:48 +00:00
Joe Fernandez
4c28487acd am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '45df16aa73c6665f55c86f4a9998e6b383b751ca':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:45:59 -08:00
Joe Fernandez
c5cb262cc6 Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8 docs: Keystore/Cert warning for Signing Apps, Issue: 8180111 
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
 2013-02-13 09:26:57 -08:00
Joe Fernandez
c698a855d2 am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:21:08 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
Scott Main
8d21b8811c am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
  lists.js files for gms and gcm
 2013-02-12 18:32:33 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Scott Main
4cd50a1212 am b8656b3c: am 42ac0372: am 72091355: am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Android Git Automerger (3) and Scott Main (1)
* commit 'b8656b3c7af99c8951459661fa5352adde5d2645':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:59:42 -08:00
Scott Main
bfec2a0189 docs: nudge dashboard chart to the right to avoid overlap 
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
 2013-02-11 14:24:03 -08:00