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

92065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
21e93bc845 am 182c06ff: am 0a413d75: am c0edc45f: am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit '182c06fffeec8162635df35765cd2504847c17e0':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:16:56 -07:00
Dirk Dougherty
182c06fffe am 0a413d75: am c0edc45f: am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit '0a413d7572c5d06331d901a66e1686bc7c99a4ac':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:14:36 -07:00
Dirk Dougherty
0a413d7572 am c0edc45f: am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit 'c0edc45fd20832b52e8d0f91632f616da585b7dd':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:12:37 -07:00
Dirk Dougherty
c0edc45fd2 am dacaad4a: Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 
* commit 'dacaad4ab21bfe8d6de74d60d2ce881d2a276a9d':
  Doc change: Add tablet optimization tips info/link.
 2013-04-24 12:10:34 -07:00
Dirk Dougherty
dacaad4ab2 Merge "Doc change: Add tablet optimization tips info/link." into jb-mr1-dev 2013-04-24 19:08:42 +00:00
Dirk Dougherty
71f8127165 Doc change: Add tablet optimization tips info/link. 
Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6
 2013-04-24 11:49:27 -07:00
Scott Main
e04458816b am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '51a452a93bb170a65921aae9ae6bddbf8ce12bff':
  make Google IO image clickable
 2013-04-23 12:37:35 -07:00
Scott Main
51a452a93b am 4af72165: am 7653fbee: make Google IO image clickable 
* commit '4af72165092fb965ec9a97599f25538aa70242b1':
  make Google IO image clickable
 2013-04-23 12:36:26 -07:00
Scott Main
4af7216509 am 7653fbee: make Google IO image clickable 
* commit '7653fbee7e4eb5d25a5b561b8142bd1af8c2cd58':
  make Google IO image clickable
 2013-04-23 12:34:30 -07:00
Scott Main
7653fbee7e make Google IO image clickable 
Change-Id: I8638012fa6be1f104f20cf2f4dcea59787fdfd08
 2013-04-23 12:32:24 -07:00
Selim Gurun
cab09cfc7a am dc9efbbb: am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'dc9efbbb61a3e8da86c3e28f05d625a721a957fc':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:23:14 -07:00
Selim Gurun
dc9efbbb61 am a5f4e79f: am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit 'a5f4e79fad39b4a0f91673c5813b1740e82144f4':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:21:49 -07:00
Selim Gurun
a5f4e79fad am 22a946d3: am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '22a946d36af4ea69956531c89f0d0852497c3892':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:20:53 -07:00
Selim Gurun
22a946d36a am 006119bf: Merge commit \'8237dd82\' into manualmerge 
* commit '006119bf2cd0b7f0ea3d1b6b0bbbfd413262504a':
  DO NOT MERGE Fix issues during backport
 2013-04-23 12:18:47 -07:00
Selim Gurun
006119bf2c Merge commit '8237dd82' into manualmerge 
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f
 2013-04-23 11:19:12 -07:00
Dirk Dougherty
c2340c4dc7 am ecf55180: am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls. 
* commit 'ecf551805ec96e050a703beb9d4033bd2757fe2e':
  Doc change: update support urls.
 2013-04-22 17:06:40 -07:00
Dirk Dougherty
ecf551805e am 04f3b81a: am c7523804: am 00cfba95: Doc change: update support urls. 
* commit '04f3b81aad12d5d28db42db40545603c6b128c1f':
  Doc change: update support urls.
 2013-04-22 17:05:08 -07:00
Dirk Dougherty
04f3b81aad am c7523804: am 00cfba95: Doc change: update support urls. 
* commit 'c7523804c890cd7ed3b61f51b9f5d029320fd406':
  Doc change: update support urls.
 2013-04-22 17:01:21 -07:00
Dirk Dougherty
c7523804c8 am 00cfba95: Doc change: update support urls. 
* commit '00cfba95ce5ea3c081b9d7353998f80a7c6edbc9':
  Doc change: update support urls.
 2013-04-22 16:59:34 -07:00
Dirk Dougherty
00cfba95ce Doc change: update support urls. 
Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f
 2013-04-22 16:37:01 -07:00
Dirk Dougherty
e5d47b39fd am cdfeb09d: am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit 'cdfeb09d65cb76cb23b965c1fac2bf22fcc80909':
  Doc change: update payment detail for merch account.
 2013-04-22 14:28:21 -07:00
Dirk Dougherty
cdfeb09d65 am 10fc5e05: am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit '10fc5e0528a7cad3f2eab0694ed471d29184ec18':
  Doc change: update payment detail for merch account.
 2013-04-22 14:27:00 -07:00
Dirk Dougherty
10fc5e0528 am cca23552: am 974af93d: Doc change: update payment detail for merch account. 
* commit 'cca235525f14ba8845ef5385036e7913c23f7dd1':
  Doc change: update payment detail for merch account.
 2013-04-22 14:25:21 -07:00
Dirk Dougherty
cca235525f am 974af93d: Doc change: update payment detail for merch account. 
* commit '974af93de950b68616aed44985720e2978db5393':
  Doc change: update payment detail for merch account.
 2013-04-22 14:22:47 -07:00
Dirk Dougherty
974af93de9 Doc change: update payment detail for merch account. 
Change-Id: I54298c010183a112776065ec894611d5de5f1cc1
 2013-04-22 14:17:36 -07:00
kmccormick
0415ea6ad9 am 2aca8dbe: am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit '2aca8dbeaf0c08e59d75c78f5b237a9cd2691784':
  Doc update: Fix firewall text.
 2013-04-22 13:13:38 -07:00
kmccormick
2aca8dbeaf am b116885c: am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'b116885c42be983732a495bb84938d290211014f':
  Doc update: Fix firewall text.
 2013-04-22 13:11:53 -07:00
Scott Main
b8ac12af56 am 3da6ef39: am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit '3da6ef399c5e3b42c0f5a8149b1f1d154556c1ff':
  fix backup registration url external bug: 54539
 2013-04-22 13:10:21 -07:00
kmccormick
b116885c42 am ce534905: Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 
* commit 'ce534905a63f97766f487798fd61cb8414da04fe':
  Doc update: Fix firewall text.
 2013-04-22 13:10:04 -07:00
Scott Main
3da6ef399c am d07bdb6f: am 2779da87: fix backup registration url external bug: 54539 
* commit 'd07bdb6fd165b31aa9e047095e18be7e76e74502':
  fix backup registration url external bug: 54539
 2013-04-22 13:08:33 -07:00
kmccormick
ce534905a6 Merge "Doc update: Fix firewall text." into jb-mr1.1-docs 2013-04-22 20:08:11 +00:00
Scott Main
d07bdb6fd1 am 2779da87: fix backup registration url external bug: 54539 
* commit '2779da87e2414709afe462339bb3cfde7feb2965':
  fix backup registration url external bug: 54539
 2013-04-22 13:06:41 -07:00
Scott Main
2779da87e2 fix backup registration url 
external bug: 54539

Change-Id: I3d4e957d8b26c7462c7228a4e4755aee88d6895c
 2013-04-22 13:03:00 -07:00
kmccormick
91290d59d5 Doc update: Fix firewall text. 
Change-Id: I06c1c86f591dc82f7004b6317062580269230cda
 2013-04-22 12:28:25 -07:00
Scott Main
abb6f472e5 am 24a3899c: am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '24a3899cb09e6af21f7886f2e567f725a5904e43':
  delete unused download page and add a couple search tags
 2013-04-22 12:17:49 -07:00
Scott Main
24a3899cb0 am 1aba107d: am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit '1aba107ddf8f8df33cbc84046ccc0c7f40a59352':
  delete unused download page and add a couple search tags
 2013-04-22 12:15:57 -07:00
Scott Main
1aba107ddf am c3ae5cd6: Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 
* commit 'c3ae5cd6852185e5a64173d3c5b3439ad507b156':
  delete unused download page and add a couple search tags
 2013-04-22 12:14:19 -07:00
Scott Main
c3ae5cd685 Merge "delete unused download page and add a couple search tags" into jb-mr1.1-docs 2013-04-22 19:12:10 +00:00
Scott Main
e0c4bb4c22 delete unused download page and add a couple search tags 
Change-Id: I8aad4703d575e2c336129e92a2b9ef448d21a4f9
 2013-04-22 12:11:18 -07:00
Dirk Dougherty
014513ae29 am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '00d20bd293e75beb546ea446901cdead39180116':
  Doc change: updates for tablet checklist.
 2013-04-20 12:08:04 -07:00
Dirk Dougherty
00d20bd293 am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit 'e0d5add782405fabe4d04b8eff00b565ea28a35f':
  Doc change: updates for tablet checklist.
 2013-04-20 12:05:45 -07:00
Dirk Dougherty
e0d5add782 am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '3fd1a8926ebfaaeccbaad86b7584fa534f725996':
  Doc change: updates for tablet checklist.
 2013-04-20 12:03:37 -07:00
Dirk Dougherty
3fd1a8926e am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 
* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
  Doc change: updates for tablet checklist.
 2013-04-20 12:01:29 -07:00
Dirk Dougherty
94ca86e8a0 Merge "Doc change: updates for tablet checklist." into jb-mr1-dev 2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6 Doc change: updates for tablet checklist. 
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
 2013-04-20 11:34:51 -07:00
Selim Gurun
5eebdb4aa8 am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:32:27 -07:00
Selim Gurun
fa1f7d21e9 am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:32:24 -07:00
Selim Gurun
a46537270e am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit '25e150a2dd60a624ceecd5a5743a622fed32ef90':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:28:40 -07:00
Selim Gurun
07c9c2912d am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host" 
* commit 'a2b0b35ed8f5c53866058f65ccf8c6e4aabef7af':
  Revert "Add a delimiter between scheme and host"
 2013-04-20 00:28:37 -07:00
Selim Gurun
25e150a2dd am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host 
* commit 'a6ca0a6b2662e06cefcdbb5eb763e79f9b798018':
  DO NOT MERGE Add a delimiter between scheme and host
 2013-04-20 00:25:09 -07:00