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

106215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
330cf2f7ff am 7afc5ca3: am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '7afc5ca353c9b4a3839c988fe6c281289495a18a':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:50:57 -07:00
Scott Main
7afc5ca353 am 57b0fed7: am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:47:53 -07:00
Scott Main
57b0fed7a9 am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:44:58 -07:00
Scott Main
603c3d8a9a am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:42:47 -07:00
Scott Main
3e82a9c9a5 am 276f0ce4: update Android Studio for v0.2.0. add release notes and troubleshooting topics 
* commit '276f0ce4df7f58786da08c34f548456129144aed':
  update Android Studio for v0.2.0. add release notes and troubleshooting topics
 2013-07-11 16:40:11 -07:00
Scott Main
276f0ce4df update Android Studio for v0.2.0. 
add release notes and troubleshooting topics

Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
 2013-07-11 16:22:21 -07:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats. 
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
 2013-07-11 11:41:24 -07:00
Jeff Sharkey
f8b692754f am 1f99a483: Recover from corrupt network stats. 
* commit '1f99a483e410811473b12d8efedd79c738df7af3':
  Recover from corrupt network stats.
 2013-07-11 11:38:50 -07:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats. 
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
 2013-07-11 11:18:53 -07:00
The Android Open Source Project
8f4e09d2a8 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I933252f3cee48c449df3ea2493e16d8652723ffc
 2013-07-10 08:34:50 -07:00
The Android Automerger
d1d1a6d068 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-10 05:55:25 -07:00
Elliott Hughes
f445a68567 am 0b18c149: am 0f50cb31: Merge "Fix build." 
* commit '0b18c14931c4ca618c67b5ac5c8351246879e90a':
  Fix build.
 2013-07-09 17:53:32 -07:00
Elliott Hughes
0b18c14931 am 0f50cb31: Merge "Fix build." 
* commit '0f50cb31980c8354a4516094863c4ad0cdd0d03b':
  Fix build.
 2013-07-09 17:51:34 -07:00
Elliott Hughes
0f50cb3198 Merge "Fix build." 2013-07-10 00:48:53 +00:00
Elliott Hughes
bfa5465ed2 Fix build. 
Change-Id: Icdbf7811e7acb8bed372def3beec8385a631713a
 2013-07-09 17:48:11 -07:00
The Android Open Source Project
f51538f444 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a
 2013-07-09 17:13:14 -07:00
Ken Wakasa
2e55547acc Revert "Stop marking gamepads as keyboards" 
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.

Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
 2013-07-09 16:32:15 -07:00
Vinit Deshpande
1f902a55f8 Revert "Temporarily disable 'Scan Always' mode" 
This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42.

Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
 2013-07-09 16:32:07 -07:00
Elliott Hughes
dff4ec87e7 am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master 
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
 2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master 
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
 2013-07-09 15:25:23 -07:00
Elliott Hughes
4a59376d5e Merge "Track libcore API change." 2013-07-09 22:08:36 +00:00
Elliott Hughes
befd0b1bdf Track libcore API change. 
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
 2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
4d380d71e0 am fb231fea: am 425729f9: Merge "Empty commit" 
* commit 'fb231fea6cd4dac7323b1df74006b294c3c9bfef':
  Empty commit
 2013-07-09 14:41:07 -07:00
Jean-Baptiste Queru
fb231fea6c am 425729f9: Merge "Empty commit" 
* commit '425729f92afc401f497e25b54460b1de8931c52e':
  Empty commit
 2013-07-09 14:39:29 -07:00
Jean-Baptiste Queru
425729f92a Merge "Empty commit" 2013-07-09 21:37:50 +00:00
Jean-Baptiste Queru
3ea7fe3054 Empty commit 
Work around a Gerrit issue.

Change-Id: If118caca3e9264f7dd88e554bb9d3cd219cb18bf
 2013-07-09 14:34:06 -07:00
Scott Main
df541931f9 am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'c4570b32d87079a5ff81262c1646fa0301b7f3b9':
  update url for backup service key bug: 8834302
 2013-07-09 10:58:43 -07:00
Dirk Dougherty
5fc1e8a33d am ec47cc77: am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'ec47cc7724464f0ce88456462cbd69aca9a6838e':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:58:40 -07:00
Scott Main
c4570b32d8 am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '29282f99252237dd9674737d26ce72afbfdd3ac1':
  update url for backup service key bug: 8834302
 2013-07-09 10:56:35 -07:00
Dirk Dougherty
ec47cc7724 am 0f97f351: am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '0f97f3510bbef333887440b6f0bc65aea2352597':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:56:32 -07:00
Scott Main
29282f9925 am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3':
  update url for backup service key bug: 8834302
 2013-07-09 10:54:18 -07:00
Dirk Dougherty
0f97f3510b am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:54:13 -07:00
Scott Main
b1b693eec6 am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1':
  update url for backup service key bug: 8834302
 2013-07-09 10:52:44 -07:00
Dirk Dougherty
cfb8f9a076 am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit '3059c70844848c7bd1aad7bffd2d5828cf745540':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:52:40 -07:00
Scott Main
5e0582cc0e am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 
* commit '7cf27aa8e3fe4735d1cf787917a524e472376e6e':
  update url for backup service key bug: 8834302
 2013-07-09 10:51:18 -07:00
Dirk Dougherty
3059c70844 am d5fee164: Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 
* commit 'd5fee1644ec9829400dda77c650694f41c5decc3':
  docs: add link to developer survey on main landing pages
 2013-07-09 10:51:15 -07:00
Scott Main
7cf27aa8e3 Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev 2013-07-09 17:50:44 +00:00
Dirk Dougherty
d5fee1644e Merge "docs: add link to developer survey on main landing pages" into jb-mr1.1-ub-dev 2013-07-09 17:50:08 +00:00
Scott Main
bd8dbf0d48 update url for backup service key 
bug: 8834302

Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
 2013-07-09 10:49:20 -07:00
Satoshi Kataoka
7e0fad1d44 am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 
* commit '8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b':
  Revert "Stop marking gamepads as keyboards"
 2013-07-09 10:25:02 -07:00
Satoshi Kataoka
8b95d259b9 am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 
* commit 'b7925f2219480d4ddbb1c655b9b386ed031815a3':
  Revert "Stop marking gamepads as keyboards"
 2013-07-09 10:23:00 -07:00
Satoshi Kataoka
b7925f2219 Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev 2013-07-09 17:20:39 +00:00
Joe Malin
fc13329b84 am 216e340b: am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '216e340b72375c5888d1023226582f75c1ed6b98':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:11:05 -07:00
Joe Malin
216e340b72 am ea4193ef: am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'ea4193efaafb280e9e969cae72a4f43b913ae8b0':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:09:00 -07:00
Joe Malin
ea4193efaa am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '46e8ca926cb9345e37ca35947d8a8ba3c131bda9':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:05:47 -07:00
Joe Malin
46e8ca926c am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a4d3dedcb18c56768bebeb3a41e257b80626f0fd':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:04:19 -07:00
Joe Malin
a4d3dedcb1 am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit '420b8212399589709b12d97323a56745480aa152':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:02:44 -07:00
Joe Malin
420b821239 am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a59eb93d1954a36b25a6277c0ce3145ce115d460':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 10:01:42 -07:00
Joe Malin
a59eb93d19 am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters training 
* commit 'a62413772e6b5dad3a018c667ded5412e235c142':
  Doc Bug: b9739899 Bugs in Sync Adapters training
 2013-07-09 09:59:10 -07:00
The Android Open Source Project
b2bc333158 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I033d0d25ecba2644ce84b294be1af7a1ab7951f2
 2013-07-09 09:37:30 -07:00