Commit Graph

31888 Commits

Author SHA1 Message Date
Jamie Gennis
cefc876234 am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:42:06 -07:00
Jamie Gennis
efeeec2564 am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
  ANativeWindow: add query for the concrete type.
2011-03-15 10:36:01 -07:00
Jamie Gennis
3c742ef11b Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 2011-03-15 10:33:35 -07:00
James Dong
4ec63136b9 Merge "Add memory leak tracking/debugging code to drm server" 2011-03-15 09:29:11 -07:00
Svetoslav Ganov
8017dbc8df am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
  Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:17:58 -07:00
Svetoslav Ganov
60b25c2c28 am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
  Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:15:24 -07:00
Svetoslav Ganov
f15a7cdbfb Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 2011-03-14 23:13:49 -07:00
satok
9b5d8fc3dd am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'f057524db620c490e96fa886238f3b31bd973060':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:51:21 -07:00
satok
3b2e2da8ab am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:47:11 -07:00
satok
6fbddcf3af Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 2011-03-14 22:44:23 -07:00
Bart Sears
b350616bc3 am faffbd80: am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
* commit 'faffbd806e6d5b66dbd1bba46f050a055116be74':
  Update Droid Fonts
2011-03-14 19:29:33 -07:00
Bart Sears
1f796e2351 am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
* commit '0c6e9521f5a8b57910451a92c1bea142edd4b30d':
  Update Droid Fonts
2011-03-14 19:25:30 -07:00
Bart Sears
325daa7336 Merge "Update Droid Fonts" into honeycomb-mr1 2011-03-14 19:24:02 -07:00
Ying Wang
3a648175cb Merge "Add screen layout size as one of the resource filtering axes." 2011-03-14 19:20:00 -07:00
Adam Powell
e1186f453b am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '15c9ab336eff66cafa365e9ea3a81f9f1b5c2635':
  Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:37:18 -07:00
Adam Powell
674de3fc7b am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9':
  Fix bug 4099023 - Phantom clicks on some websites
2011-03-14 18:33:56 -07:00
Adam Powell
5ec9119256 Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 2011-03-14 18:32:45 -07:00
Justin Ho
21ee90d612 am 71ee3ba0: am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1
* commit '71ee3ba0f08b4be70bf986ea2c7f9f5261bca8a2':
  Updated HTML5 media playback controls Bug: 4080127
2011-03-14 18:31:08 -07:00
Justin Ho
9f31bd73f8 am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
  Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:31:06 -07:00
Justin Ho
8a97bb527f am 7bc341cf: am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
* commit '7bc341cf80fb5d6b4a8a3304c672341ed9810825':
  Updated textfield search assets Bug: 3321263
2011-03-14 18:31:03 -07:00
Ying Wang
afd3fde989 am a7ec506e: am e422f7a2: am bf079216: Dist classes.jar with full class files inside
* commit 'a7ec506e4a91e2cb68123462d3c0d5276ae29c86':
  Dist classes.jar with full class files inside
2011-03-14 18:27:34 -07:00
Mike Lockwood
377f61f63b am 70882ca3: (-s ours) am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '70882ca39fd010abd93544ec6dd15a003601f24c':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 18:27:30 -07:00
Simon Wilson
81a2768553 am 321e4c9c: (-s ours) am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '321e4c9c8fa32b814d59e81fec2c7f07b4861928':
  DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 18:27:28 -07:00
Daniel Sandler
e2bd5523a5 am 8fccbcfb: am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread
* commit '8fccbcfb8ea2e13727367b46ea4bb562f69d0bca':
  Workaround unknown ERI indices.
2011-03-14 18:27:25 -07:00
Justin Ho
a7cf08664b am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
2011-03-14 18:25:45 -07:00
Justin Ho
beb4a201a5 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
2011-03-14 18:25:43 -07:00
Justin Ho
37e8286256 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
2011-03-14 18:25:40 -07:00
Ying Wang
37702cf67d am e422f7a2: am bf079216: Dist classes.jar with full class files inside
* commit 'e422f7a21aa094c10489d92d38c70bf688c3c5a8':
  Dist classes.jar with full class files inside
2011-03-14 18:25:01 -07:00
Mike Lockwood
0de9769133 am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit 'ccdac700df7089a87e6bf284e45a30a7a6a62602':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 18:24:58 -07:00
Simon Wilson
69d328abcd am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread
* commit '81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0':
  DO NOT MERGE Support WiMAX Settings & ticker message
2011-03-14 18:24:48 -07:00
Daniel Sandler
267a688f18 am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread
* commit '9bbaa1564b81e97d3c26ad603a0d67789f275ed5':
  Workaround unknown ERI indices.
2011-03-14 18:24:42 -07:00
Justin Ho
0ff0466b2d Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 2011-03-14 18:24:13 -07:00
Justin Ho
83d83cb42a Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 2011-03-14 18:24:06 -07:00
Justin Ho
7ebaeaec62 Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-14 18:23:18 -07:00
Romain Guy
f28961b1b1 am b245e31f: am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug " into honeycomb-mr1
* commit 'b245e31fa8dd1ad6a59ccf858154f3c7b92e0eb8':
  Fix rendering artifact in edge fades. Bug 
2011-03-14 18:21:21 -07:00
Romain Guy
230e05c01e am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug " into honeycomb-mr1
* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
  Fix rendering artifact in edge fades. Bug 
2011-03-14 18:18:03 -07:00
Romain Guy
b6549c81ee Merge "Fix rendering artifact in edge fades. Bug " into honeycomb-mr1 2011-03-14 18:16:39 -07:00
Dirk Dougherty
f815e04434 am 8991851b: am a5732aa2: am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
* commit '8991851b776ec3b16dd0918fa3a88332b7f30ba7':
  Doc change: updated home tab announce post-GDC
2011-03-14 17:57:19 -07:00
Dirk Dougherty
6964370320 am a5732aa2: am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
* commit 'a5732aa275273edf9ae91340a440b3f2cd47c682':
  Doc change: updated home tab announce post-GDC
2011-03-14 17:52:31 -07:00
Jamie Gennis
96e0873907 am adf565f0: am 1a0452b7: am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
* commit 'adf565f02676a8f41b572d23123695e732ffd321':
  SurfaceTexture: fix transform matrix computation.
2011-03-14 17:51:48 -07:00
Mike Lockwood
1743274339 am 1c4e4fcc: am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit '1c4e4fcc473f47bda351cec3e48652f5392e6498':
  Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:51:44 -07:00
Mike Lockwood
f79a19014b am 01178a5c: am 5da789a6: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '01178a5c5f4d53c0a7f740eaa9c500734d075a0c':
2011-03-14 17:51:42 -07:00
Mike Lockwood
d70759d643 am dacdb6e5: am 8f455b2e: Add support for USB accessory serial numbers
* commit 'dacdb6e586beba067fe602850e59399f4887e69c':
  Add support for USB accessory serial numbers
2011-03-14 17:51:39 -07:00
Dirk Dougherty
c090fb2f55 am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb
* commit '2f1d2ce1f2d58f959adaf8ce514d39970210331a':
  Doc change: updated home tab announce post-GDC
2011-03-14 17:50:06 -07:00
James Dong
3d4d153684 Merge "Add a release() method to MediaScanner" 2011-03-14 17:49:25 -07:00
Jamie Gennis
dc580bdad7 am 1a0452b7: am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
* commit '1a0452b715727579a2a4408092f51f751c12f777':
  SurfaceTexture: fix transform matrix computation.
2011-03-14 17:49:15 -07:00
Mike Lockwood
1119053992 am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit '38bc9f0701150e089dd624bb30ac286637b5c2b9':
  Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:49:13 -07:00
Mike Lockwood
e006db9c95 am 5da789a6: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
* commit '5da789a6735a9e06e6cd6b72b09c7de9bf7715a8':
2011-03-14 17:49:02 -07:00
Mike Lockwood
019ce758bc am 8f455b2e: Add support for USB accessory serial numbers
* commit '8f455b2e265f95ba5ea5b14009a91148a5b072b4':
  Add support for USB accessory serial numbers
2011-03-14 17:48:57 -07:00
Mike Lockwood
1d70f17b38 am 0958fb10: am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
* commit '0958fb1068ee1b5e6c40eee16d943a664b1124b4':
  Add support for USB accessory serial numbers
2011-03-14 17:47:49 -07:00