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
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
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
230e05c01e
am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
...
* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
Fix rendering artifact in edge fades. Bug #4092053
2011-03-14 18:18:03 -07:00
Romain Guy
b6549c81ee
Merge "Fix rendering artifact in edge fades. Bug #4092053 " into honeycomb-mr1
2011-03-14 18:16:39 -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
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
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
Jamie Gennis
bae774eb20
SurfaceTextureClient: Add ISurfaceTexture getter.
...
This change adds a getter method to SurfaceTextureClient to get the
ISurfaceTexture object with which the SurfaceTextureClient is
communicating.
Bug: 4086509
Change-Id: Ifec621e0fe5392a5be56b2348fdc54067cbebcdd
2011-03-14 17:47:11 -07:00
Jamie Gennis
391bbe2246
ANativeWindow: add query for the concrete type.
...
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.
Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
2011-03-14 17:47:11 -07:00
Jamie Gennis
c6a4156f18
am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
...
* commit '122dd0999f09eedbe42e619b64276633bea60e6a':
SurfaceTexture: fix transform matrix computation.
2011-03-14 17:45:38 -07:00
Mike Lockwood
a055776a3d
am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
...
* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b':
Fix broadcast receiver leak in UsbConfirmActivity
2011-03-14 17:45:29 -07:00
Mike Lockwood
0b73c16133
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
2011-03-14 17:45:28 -07:00
Dirk Dougherty
fb2a846013
Merge "Doc change: updated home tab announce post-GDC" into honeycomb
2011-03-14 17:44:28 -07:00
Jamie Gennis
827ebdbbff
Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1
2011-03-14 17:42:48 -07:00
Mike Lockwood
e1092edebc
Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
2011-03-14 17:42:04 -07:00
Mike Lockwood
0b1a7c91d5
am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
...
* commit '221830b93d6f35bcf20db2d34978392b43f44221':
Add support for USB accessory serial numbers
2011-03-14 17:41:22 -07:00
Mike Lockwood
b773befa81
Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
2011-03-14 17:39:43 -07:00
Shailendra Yadav
2ea0c765f9
am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1
...
* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
Fix for Don't allow adding 64-bit files(4086708)
2011-03-14 17:36:56 -07:00
Gloria Wang
8cbc72c1e2
am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
...
* commit '132bb659b643348f29292810e42800441df41ceb':
For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:36:42 -07:00
Shailendra Yadav
de7426d7e2
Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1
2011-03-14 17:23:05 -07:00
Gloria Wang
848ddad0a3
Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
2011-03-14 17:02:58 -07:00
Scott Main
8ab20ca84a
am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit '9f3f36c95b87aab2c5f7cd6b6e18927f8ebfa9c4':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 17:02:34 -07:00
Scott Main
99dbf7920e
am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit '04e1af802abfcecda2b86f1a3082a5c806026beb':
docs: release notes for ADT 10.0.1
2011-03-14 17:02:31 -07:00
Scott Main
02451ddf6c
am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
...
* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc
2011-03-14 16:42:28 -07:00
Scott Main
1bc0a08a95
am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
docs: release notes for ADT 10.0.1
2011-03-14 16:42:17 -07:00
Scott Main
1b87152752
Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb
2011-03-14 16:08:09 -07:00
Nicolas Roard
644cd4baf6
am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
...
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
2011-03-14 15:39:37 -07:00
Xavier Ducrohet
4030041e1d
am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
...
* commit '7608181ca76eda1ab64661ddae13bbb92e185ae8':
LayoutLib: Fix Arc rendering.
2011-03-14 15:29:13 -07:00
Neel Parekh
c65fa01ede
am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '5b3d18cfa2879e47a4d9c06024b81c63c48e41f1':
2011-03-14 15:29:06 -07:00
Nicolas Roard
28a615aff5
am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video
...
* commit 'f146fd9c2122ac27bc1a70c16864899c94371923':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:29:00 -07:00
Nicolas Roard
579a30dca2
Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1
2011-03-14 15:26:58 -07:00
Xavier Ducrohet
40df79ffb6
am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
...
* commit '491ef0c6bdaa45201278813bdfbf859801aba655':
LayoutLib: Fix Arc rendering.
2011-03-14 15:25:45 -07:00
Neel Parekh
0c2fb9355f
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
2011-03-14 15:25:44 -07:00
Nicolas Roard
9cca3de381
am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
...
* commit 'b6866f81a945d57390542526b154edae01ee795e':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:24:57 -07:00
Renaud-Roland Hubert
0e69b1364d
am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '58162eba33c287d747ceb4753abf6c3ba4223466':
2011-03-14 15:24:54 -07:00