summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add ↵Scott Main2013-07-114-21/+167
|\ | | | | | | | | | | | | release notes and troubleshooting topics * commit '603c3d8a9ac2b81be0ea09690ba324e2ed744ccd': update Android Studio for v0.2.0. add release notes and troubleshooting topics
| * am 3e82a9c9: am 276f0ce4: update Android Studio for v0.2.0. add release ↵Scott Main2013-07-114-21/+167
| |\ | | | | | | | | | | | | | | | | | | notes and troubleshooting topics * commit '3e82a9c9a5339dca5f4a91c6e5822906cd632ae2': update Android Studio for v0.2.0. add release notes and troubleshooting topics
| | * am 276f0ce4: update Android Studio for v0.2.0. add release notes and ↵Scott Main2013-07-114-21/+167
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | troubleshooting topics * commit '276f0ce4df7f58786da08c34f548456129144aed': update Android Studio for v0.2.0. add release notes and troubleshooting topics
| | | * update Android Studio for v0.2.0.Scott Main2013-07-114-21/+167
| | | | | | | | | | | | | | | | | | | | | | | | add release notes and troubleshooting topics Change-Id: Ic924d61f9ab9208ed3275edb8837d8593d752ae9
* | | | Recover from corrupt network stats.Jeff Sharkey2013-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering corrupt stats, throw as IOException to allow recovery at a higher level. Bug: 9794832 Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
* | | | am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service ↵Scott Main2013-07-091-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | key bug: 8834302" into jb-mr1.1-ub-dev * commit 'b1b693eec6e171a059190e6f17ff53b8c558cbb3': update url for backup service key bug: 8834302
| * | | am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: ↵Scott Main2013-07-091-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | 8834302" into jb-mr1.1-ub-dev * commit '5e0582cc0e09a209bed321323ad9dad3ca51dcb1': update url for backup service key bug: 8834302
| | * | am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into ↵Scott Main2013-07-091-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | jb-mr1.1-ub-dev * commit '7cf27aa8e3fe4735d1cf787917a524e472376e6e': update url for backup service key bug: 8834302
| | | * Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-devScott Main2013-07-091-1/+1
| | | |\
| | | | * update url for backup service keyScott Main2013-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8834302 Change-Id: I7bd35db2531bf03c7503cdf56f932cedacaa6771
* | | | | am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs: add link to developer ↵Dirk Dougherty2013-07-0922-6/+177
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | survey on main landing pages" into jb-mr1.1-ub-dev * commit 'cfb8f9a07681cc090428a47aa856cba51be29ce5': docs: add link to developer survey on main landing pages
| * | | | am 3059c708: am d5fee164: Merge "docs: add link to developer survey on main ↵Dirk Dougherty2013-07-0922-6/+177
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | landing pages" into jb-mr1.1-ub-dev * commit '3059c70844848c7bd1aad7bffd2d5828cf745540': docs: add link to developer survey on main landing pages
| | * | | am d5fee164: Merge "docs: add link to developer survey on main landing ↵Dirk Dougherty2013-07-0922-6/+177
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | pages" into jb-mr1.1-ub-dev * commit 'd5fee1644ec9829400dda77c650694f41c5decc3': docs: add link to developer survey on main landing pages
| | | * | Merge "docs: add link to developer survey on main landing pages" into ↵Dirk Dougherty2013-07-0922-6/+177
| | | |\ \ | | | | |/ | | | |/| | | | | | jb-mr1.1-ub-dev
| | | | * docs: add link to developer survey on main landing pagesScott Main2013-07-0822-6/+177
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76
* | | | | Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-devSatoshi Kataoka2013-07-091-8/+5
|\ \ \ \ \
| * | | | | Revert "Stop marking gamepads as keyboards"Ken Wakasa2013-07-051-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846. Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0 bug: 8896129
* | | | | | am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: ↵Joe Malin2013-07-092-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b9739899 Bugs in Sync Adapters training * commit '46e8ca926cb9345e37ca35947d8a8ba3c131bda9': Doc Bug: b9739899 Bugs in Sync Adapters training
| * | | | | am a4d3dedc: am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs ↵Joe Malin2013-07-092-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | in Sync Adapters training * commit 'a4d3dedcb18c56768bebeb3a41e257b80626f0fd': Doc Bug: b9739899 Bugs in Sync Adapters training
| | * | | | am 420b8212: am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync ↵Joe Malin2013-07-092-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Adapters training * commit '420b8212399589709b12d97323a56745480aa152': Doc Bug: b9739899 Bugs in Sync Adapters training
| | | * | | am a59eb93d: am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters trainingJoe Malin2013-07-092-2/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a59eb93d1954a36b25a6277c0ce3145ce115d460': Doc Bug: b9739899 Bugs in Sync Adapters training
| | | | * \ \ am a6241377: Doc Bug: b9739899 Bugs in Sync Adapters trainingJoe Malin2013-07-092-2/+2
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a62413772e6b5dad3a018c667ded5412e235c142': Doc Bug: b9739899 Bugs in Sync Adapters training
| | | | | * | | Doc Bug: b9739899 Bugs in Sync Adapters trainingJoe Malin2013-07-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6f0fc79c73dd66a1d8306e49ff51fc29fb62c7f
* | | | | | | | am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog postScott Main2013-07-081-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '61e1a650c032c1169c31aad7e0aed085c400327d': add link to cloud backend blog post
| * | | | | | | am e4d65d24: am eceeaf11: add link to cloud backend blog postScott Main2013-07-081-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4d65d24c3d9b6ce286193c451b1e90fb2265215': add link to cloud backend blog post
| | * | | | | | am eceeaf11: add link to cloud backend blog postScott Main2013-07-081-0/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eceeaf11467e53cbc7196695953d28ad896a3c6d': add link to cloud backend blog post
| | | * | | | | add link to cloud backend blog postScott Main2013-07-081-0/+2
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | Change-Id: I38376ff9ceaa7338f03cdfe6cd1685efafa1a4e2
* | | | | | | am 375d9f33: am b13f9eeb: am 9c35004e: add xxhdpi information to tablet ↵Scott Main2013-07-081-37/+45
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checklist * commit '375d9f333a8acd12587de4b9393b63d1e379ca53': add xxhdpi information to tablet checklist
| * | | | | | am b13f9eeb: am 9c35004e: add xxhdpi information to tablet checklistScott Main2013-07-081-37/+45
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b13f9eeba107ef21d7488db88821e3b41242cf32': add xxhdpi information to tablet checklist
| | * | | | | am 9c35004e: add xxhdpi information to tablet checklistScott Main2013-07-081-37/+45
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '9c35004eabc48509c22d27f0a32ef7391e7ce923': add xxhdpi information to tablet checklist
| | | * | | | add xxhdpi information to tablet checklistScott Main2013-07-081-37/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8eff162527a9de59c667a7152b70eed7590ddbe3
* | | | | | | am 637c15df: am 98dc0c44: am 31da6322: dashboard update for 7/8Scott Main2013-07-081-23/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '637c15dfffd3a75998f7dbf2061b249d026b9eb1': dashboard update for 7/8
| * | | | | | am 98dc0c44: am 31da6322: dashboard update for 7/8Scott Main2013-07-081-23/+18
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '98dc0c447fe2f71dbac16343a63203052e99cee1': dashboard update for 7/8
| | * | | | | am 31da6322: dashboard update for 7/8Scott Main2013-07-081-23/+18
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '31da63220f1038b65d094bf510cd22f6a6da9769': dashboard update for 7/8
| | | * | | | dashboard update for 7/8Scott Main2013-07-081-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4935d5544754bbbd1ceb3d535ad5cb9a5dbe2453
* | | | | | | am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync ↵Joe Malin2013-07-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapters Android Training * commit '07797c45dea5bcdf4c21ee7a30e02af98a2d8ed8': DOC: Sync Adapters Android Training
| * | | | | | am 5c27ec22: am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters ↵Joe Malin2013-07-087-0/+1841
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android Training * commit '5c27ec22133cbea536283c971857759e9e7188ba': DOC: Sync Adapters Android Training
| | * | | | | am c7d3d28b: am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android TrainingJoe Malin2013-07-087-0/+1841
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c7d3d28b67ee038e6cb2b7a7ad80ea4a8fd3acdd': DOC: Sync Adapters Android Training
| | | * | | | am 8b3c7d0c: am c355a1c1: DOC: Sync Adapters Android TrainingJoe Malin2013-07-087-0/+1841
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '8b3c7d0c8fec82a6ad32abcb7e78416d8513512d': DOC: Sync Adapters Android Training
| | | | * | | am c355a1c1: DOC: Sync Adapters Android TrainingJoe Malin2013-07-087-0/+1841
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | * commit 'c355a1c156ef549f97e3dc6611ab2a9c484889c5': DOC: Sync Adapters Android Training
| | | | | * | DOC: Sync Adapters Android TrainingJoe Malin2013-06-307-0/+1841
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia857483e1e530436d3c0b1c99697bd52eaa37903 (cherry picked from commit e9df511e2018eb6a296408d09e355c6f2c77ae59)
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e7dc51b5b326c7269cdb31a02642511d6dbf52b Auto-generated-cl: translation import
* | | | | | | Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-devVinit Deshpande2013-07-032-9/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "Temporarily disable 'Scan Always' mode"Vinit Deshpande2013-07-032-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c16b0d0061108685e74b40d77ad801fe0304bc42. Change-Id: I89a23f5d786a53eea97fef3f19bd15f97fc26157
* | | | | | | | Merge "docs: Updated uiautomator developer guide documentation for JB MR2 ↵quddusc2013-07-0212-5082/+7479
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | release. Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348" into jb-mr2-dev
| * | | | | | | | docs: Updated uiautomator developer guide documentation for JB MR2 release.quddusc2013-07-0212-5082/+7479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8224013,8223957,8223641,8223589,8223815,7738720,7538348 Change-Id: Id81ef4eec7c83ef8bfb8168e82fccc9d002fda99
* | | | | | | | | Merge "Fix NPE if mobile is not supported in checkMobileProvisioning." into ↵Wink Saville2013-07-021-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | | | Fix NPE if mobile is not supported in checkMobileProvisioning.Wink Saville2013-07-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9664438 Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ac72382fe871e8259decec6f202119bf9519972 Auto-generated-cl: translation import