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
James Dong
3d4d153684
Merge "Add a release() method to MediaScanner"
2011-03-14 17:49:25 -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
Shailendra Yadav
38696928db
am e987cbaf: am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1
...
* commit 'e987cbafc2a6c19cae1ccf50658fb6320bda084a':
Fix for Don't allow adding 64-bit files(4086708)
2011-03-14 17:41:53 -07:00
Gloria Wang
c7e75e58ed
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
...
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
For issue 4082089 Add more info and error events into the DRM framework
2011-03-14 17:41:42 -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
Scott Main
c834e33444
am 5355178a: 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 '5355178a45bdc286d49f04f90059f1e5d0c41a82':
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:10:11 -07:00
Scott Main
c62ee380d7
am c0f3e4f4: am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1
...
* commit 'c0f3e4f40e27db549a877777f8ef51522dd97a1d':
docs: release notes for ADT 10.0.1
2011-03-14 17:10:09 -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
Iliyan Malchev
3875d79ef6
Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
2011-03-14 16:58:05 -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
Nicolas Roard
1a26fd48c8
am 373ece1f: 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 '373ece1fa158d72152712b36674a9c114a40b649':
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 16:36:50 -07:00
Xavier Ducrohet
531223a9f4
am c192ec26: am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
...
* commit 'c192ec26c35c045cb2744193f17e2cf5dd809f5e':
LayoutLib: Fix Arc rendering.
2011-03-14 16:08:53 -07:00
Neel Parekh
ddc89d2aaf
am 4cef246c: am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '4cef246c0b43a68d1154172d673852dad7a808e2':
2011-03-14 16:08:34 -07:00
Nicolas Roard
6c9c592fb2
am a2a72f01: am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video
...
* commit 'a2a72f01d97ccada0f6b02908066ffb0d3a19a61':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 16:08:29 -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
9bc7dc2114
am 21f86159: am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
...
* commit '21f86159ffa78dd4bd7fec2053dc2413f0cc7288':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:27:25 -07:00
Renaud-Roland Hubert
b8de36d106
am 04da3dc6: am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '04da3dc67ea9342b0864de684aed2efdd98c2412':
2011-03-14 15:27:21 -07:00
Jamie Gennis
a96e85f342
am ef1d5f3e: am 21752785: gl2_yuvtex: use the gralloc-provided stride.
...
* commit 'ef1d5f3e5ebe7ba927d032f4f6fe82a7552014b0':
gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:27:14 -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
Jamie Gennis
5b92e39c14
am dcbc2557: am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
...
* commit 'dcbc255734e506bacd36d8d9483b7f3d6d96d10b':
gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:25:14 -07:00
James Wilson
761bc86601
am 46a36422: am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '46a3642251b5fd6c37720284108304e69f0f8166':
2011-03-14 15:25:12 -07:00
Huahui Wu
0c52c9878c
am e7c4b7a7: am cc8fa160: b/3392594 keep the remain touch points when one is ended.
...
* commit 'e7c4b7a7d1bf2169250bbc3f0aaa52a464fd8218':
b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:25:07 -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
Jamie Gennis
fee6d64833
am 21752785: gl2_yuvtex: use the gralloc-provided stride.
...
* commit '21752785bae7c1beaf5729e43973bed6b9e14520':
gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:24:51 -07:00
Xavier Ducrohet
520eb2f5b5
Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1
2011-03-14 15:24:20 -07:00
Jamie Gennis
22943e256e
am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1
...
* commit 'c313b59b4295c7cfe7f13d635be2c85f9fee7365':
gl2_yuvtex: use the gralloc-provided stride.
2011-03-14 15:22:34 -07:00
James Wilson
5c8257a855
am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '5efa65d1948c3396d4f68a64c9fe4788a4ab0d62':
2011-03-14 15:22:31 -07:00
Huahui Wu
f8a473e8de
am cc8fa160: b/3392594 keep the remain touch points when one is ended.
...
* commit 'cc8fa160fbfcd17f369c15a2d33959fbb090ac6e':
b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:22:29 -07:00
Huahui Wu
16c51acc59
am ddba200b: am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1
...
* commit 'ddba200b425c56b3b66ead23e8d5fd51a17c6cc4':
b/3392594 keep the remain touch points when one is ended.
2011-03-14 15:22:12 -07:00
Huahui Wu
ad86182a9d
am 21e30abf: am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '21e30abf68554bee9cb143e17f3919432b6eb0c9':
2011-03-14 15:22:08 -07:00
Eric Fischer
3d27e84cdd
am a3ef0bb7: (-s ours) am d5e8dae8: Import revised translations. DO NOT MERGE
...
* commit 'a3ef0bb7af48525ad8c0064185ba0019298b0675':
Import revised translations. DO NOT MERGE
2011-03-14 15:22:06 -07:00
Scott Main
29632a4deb
am c710cf37: am c899d32e: docs: update search dev guide with SearcView widget
...
* commit 'c710cf379f61c767d372104a3c9d6142d54aa02f':
docs: update search dev guide with SearcView widget
2011-03-14 15:22:03 -07:00
Eric Fischer
7bf0e75a4c
am 6617e1fc: am e0b33ce0: Add "new incognito window" translations.
...
* commit '6617e1fcb4ffbec4f339e0d6c727643b0c2da1d7':
Add "new incognito window" translations.
2011-03-14 15:22:00 -07:00
Nicolas Roard
8d391b321c
am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1
...
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
Adding placeholders for the fullscreen button used by the browser for HTML5 video
2011-03-14 15:21:46 -07:00