Scott Main
a0e5172d0b
am a7276805: am b269346c: am d4952380: fix md5sum for windows installer
...
* commit 'a7276805bfad4b3170f7887f8358b5f8e5bef943':
fix md5sum for windows installer
2011-02-14 09:46:08 -08:00
Xia Wang
415485bafe
Merge "Add wait time for Wi-Fi tethering test, bug http://b/issue?id=3436586 "
2011-02-14 09:32:10 -08:00
Scott Main
9acd998bcf
am b269346c: am d4952380: fix md5sum for windows installer
...
* commit 'b269346ca333a975d37ac50fec0c7b6a4c39a3de':
fix md5sum for windows installer
2011-02-14 09:25:30 -08:00
Scott Main
1f14e87b4c
am d4952380: fix md5sum for windows installer
...
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
fix md5sum for windows installer
2011-02-14 09:14:12 -08:00
Daniel Sandler
f388fd32a3
Merge "Put the pocket back in my pocket for later."
2011-02-14 08:21:03 -08:00
Adam Cohen
f053b37eed
Merge "Fixing a bug in RemoteViewsAdapter where cached items weren't being marked as requested"
2011-02-11 18:25:43 -08:00
Basavapatna Dattaguru
da2cb18e5f
Merge "VideoEditor: Fixes Issue ID:3448077"
2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
f4a95d6e8d
Merge "VideoEditor: Populate profile&level: Issue:3419090"
2011-02-11 17:48:45 -08:00
Vasu Nori
0163f9acbb
Merge "add more debug info to help (bug:3446432)"
2011-02-11 16:57:40 -08:00
Eric Laurent
99700fe277
Merge "Fix issue 3400751."
2011-02-11 16:54:48 -08:00
Stephen Hines
d95f6454a3
am e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
...
* commit 'e49f75eb4634f8ee70ad0b5fbd8c6ea19773024f':
Fix struct initializer for balls.
2011-02-11 16:49:48 -08:00
Roman Nurik
a19c563c3b
am 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
...
* commit '471f89cc8666f484c5a609503f16d806b8c716f0':
Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
2011-02-11 16:47:34 -08:00
Stephen Hines
2d917c1675
am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
...
* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
Fix struct initializer for balls.
2011-02-11 16:47:04 -08:00
Roman Nurik
cbc11b7a74
am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
...
* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
2011-02-11 16:44:52 -08:00
Stephen Hines
906bb20fa7
Merge "Fix struct initializer for balls." into honeycomb
2011-02-11 16:44:49 -08:00
Roman Nurik
afb5dda2f2
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb
2011-02-11 16:43:32 -08:00
Robert Ly
4ab58a4754
am 154e849b: am ccea5d27: Doc change: tools, adt, ndk release notes
...
* commit '154e849b72f6c71ee4c996b6dc67a46e7f8703df':
Doc change: tools, adt, ndk release notes
2011-02-11 16:31:59 -08:00
Robert Ly
6163399831
am ccea5d27: Doc change: tools, adt, ndk release notes
...
* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
Doc change: tools, adt, ndk release notes
2011-02-11 16:30:15 -08:00
Yu Shan Emily Lau
25a17435d0
Merge "Add the open source test media contents."
2011-02-11 16:16:06 -08:00
Jesse Wilson
9837a4c99d
Merge "Add a new method, LruCache.remove"
2011-02-11 15:56:15 -08:00
Roman Nurik
c21d04a03a
am d822438f: am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
...
* commit 'd822438fa7fcc23df3a240a65ad4ba1fe6fe7cc7':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
2011-02-11 15:44:46 -08:00
Roman Nurik
595abee860
am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
...
* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
2011-02-11 15:42:57 -08:00
James Dong
155fb47d4f
Merge "Make available h263 DSI information from MPEG4Extractor"
2011-02-11 15:38:20 -08:00
Adam Cohen
7c4bd5e906
am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
...
* commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4':
Adding StackWidget sample code
2011-02-11 15:29:43 -08:00
Winson Chung
6e6329a132
am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
...
* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
2011-02-11 15:29:35 -08:00
Adam Cohen
4956b09d6b
am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
...
* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
Adding StackWidget sample code
2011-02-11 15:23:27 -08:00
Adam Cohen
dd8df9a233
Merge "Adding StackWidget sample code" into honeycomb
2011-02-11 15:19:38 -08:00
Basavapatna Dattaguru
c009320b0d
Merge "Video Editor CTS Test Code: annotation suppress"
2011-02-11 15:17:06 -08:00
Winson Chung
bff6b07797
am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
...
* commit '5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
2011-02-11 15:15:33 -08:00
Basavapatna Dattaguru
4c5a49e5ae
Merge "VideoEditor Test contents: Issue ID:3396697"
2011-02-11 15:08:28 -08:00
Winson Chung
d25f3d54db
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
2011-02-11 15:07:06 -08:00
Eric Laurent
dabb87dd40
Merge "Fix issue 3425342."
2011-02-11 14:48:20 -08:00
Robert Ly
2a95bdbe1a
am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
...
* commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79':
Doc change: nfc dev guide
2011-02-11 14:02:00 -08:00
Xia Wang
c9dd8a8479
Merge "Fix test3GToWifiNotification for mobile state validation."
2011-02-11 13:55:44 -08:00
Andreas Huber
4ec372d0cc
Merge "Start playing (and decoding) audio only after the first video frame has been decoded."
2011-02-11 13:50:12 -08:00
Robert Ly
120a181976
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
...
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
2011-02-11 13:49:09 -08:00
Robert Ly
e3fd2631d6
am 6059bb3e: am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '6059bb3e24bf47c3bfd805c887775db817d537e7':
Doc change: updating animation framework topic
2011-02-11 13:21:47 -08:00
Robert Ly
666820aa38
am 41d34195: am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '41d34195f9d0c6a1548bb9c0de27a8cfd147210f':
Doc change: renderscript dev guide
2011-02-11 13:21:44 -08:00
Robert Ly
7e67e8bdfc
am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
2011-02-11 13:18:41 -08:00
Robert Ly
be46db59f1
am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
2011-02-11 13:18:33 -08:00
Robert Ly
6619488871
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Robert Ly
b7425b51b5
Merge "Doc change: updating animation framework topic" into honeycomb
2011-02-11 13:15:55 -08:00
Robert Ly
5e349a4031
Merge "Doc change: renderscript dev guide" into honeycomb
2011-02-11 13:15:35 -08:00
Jesse Wilson
d976e33cad
Merge "Remove LruCache.setMaxSize()."
2011-02-11 12:45:29 -08:00
James Dong
908589d3fa
am d24d00ae: am f9e7442a: Update sample code in documentation
...
* commit 'd24d00ae1c0eaa20ec9f8581be4baba723ea4a00':
Update sample code in documentation
2011-02-11 12:00:14 -08:00
James Dong
6a4db29916
am f9e7442a: Update sample code in documentation
...
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
2011-02-11 11:56:33 -08:00
Robert Greenwalt
f839ac7050
Merge "Update LinkProperties treatment of gateways"
2011-02-11 11:38:44 -08:00
Dheeraj Sharma
64ca6180c2
Merge "Fix for issue : 3439708 Last frame is missing effect"
2011-02-11 10:57:31 -08:00
Amith Yamasani
d78fb43bb1
Merge "Fix over-eager locking of volume dialog's primary stream."
2011-02-11 10:42:56 -08:00
Jean-Baptiste Queru
0d65146bac
am 0ba97e3f: am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc':
stubs
2011-02-11 10:33:58 -08:00