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 |
|
The Android Automerger
|
af39e2622c
|
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
2013-07-09 05:55:27 -07:00 |
|
Scott Main
|
5c949ee481
|
am 0ebc82fe: am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post
* commit '0ebc82fe79966882bf6cf798afa6c67e1fc7d196':
add link to cloud backend blog post
|
2013-07-08 18:22:42 -07:00 |
|
Scott Main
|
0ebc82fe79
|
am 597d7040: am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post
* commit '597d7040309d86e366be7804238750ccc733a7ad':
add link to cloud backend blog post
|
2013-07-08 18:20:40 -07:00 |
|
Scott Main
|
597d704030
|
am 61e1a650: am e4d65d24: am eceeaf11: add link to cloud backend blog post
* commit '61e1a650c032c1169c31aad7e0aed085c400327d':
add link to cloud backend blog post
|
2013-07-08 18:18:26 -07:00 |
|
Scott Main
|
61e1a650c0
|
am e4d65d24: am eceeaf11: add link to cloud backend blog post
* commit 'e4d65d24c3d9b6ce286193c451b1e90fb2265215':
add link to cloud backend blog post
|
2013-07-08 18:15:25 -07:00 |
|
Scott Main
|
e4d65d24c3
|
am eceeaf11: add link to cloud backend blog post
* commit 'eceeaf11467e53cbc7196695953d28ad896a3c6d':
add link to cloud backend blog post
|
2013-07-08 18:13:19 -07:00 |
|
Scott Main
|
eceeaf1146
|
add link to cloud backend blog post
Change-Id: I38376ff9ceaa7338f03cdfe6cd1685efafa1a4e2
|
2013-07-08 17:29:22 -07:00 |
|
Scott Main
|
da31f2ea92
|
docs: add link to developer survey on main landing pages
Change-Id: Ib842dc074be9541764379d2adfecb0af01751d76
|
2013-07-08 16:16:21 -07:00 |
|
Joe Malin
|
a62413772e
|
Doc Bug: b9739899 Bugs in Sync Adapters training
Change-Id: Ia6f0fc79c73dd66a1d8306e49ff51fc29fb62c7f
|
2013-07-08 15:37:34 -07:00 |
|
The Android Open Source Project
|
7c2ea97483
|
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae
|
2013-07-08 15:33:43 -07:00 |
|
Jean-Baptiste Queru
|
9058a6c881
|
am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
FastScroller: Fix to use appropriate index
|
2013-07-08 14:43:01 -07:00 |
|
Jean-Baptiste Queru
|
928e045f9a
|
am b8b94d9b: am 538bd4d8: Merge "Fixing missing internal link in document."
* commit 'b8b94d9bb18bd693b77050414d82a3975268ad08':
Fixing missing internal link in document.
|
2013-07-08 14:42:59 -07:00 |
|