Robert Ly
dab2072130
am c3038308: Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
...
* commit 'c3038308a765de2826997b65c175bf752b45bc70':
Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package
2011-05-09 14:41:00 -07:00
Robert Ly
93f4ccf24b
Merge "Doc change: adding ADK doc. still need to add the adk pkg download link when we get the package" into honeycomb-mr1
2011-05-09 14:25:53 -07:00
Marco Nelissen
c9f856467d
Merge "When using O_CREAT, the mode should be specified."
2011-05-09 13:03:43 -07:00
James Dong
4c2f9dbffa
Merge "Refactor MPEG4Writer::writeTrackHeader() method"
2011-05-09 11:27:51 -07:00
The Android Automerger
859dc1d0fe
am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
...
* commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525':
DO NOT MERGE Handle GET_POWER failures
DO NOT MERGE: Don't send pause again when coming back from full screen
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
DO NOT MERGE MTP: Implement GetThumb command
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
DO NOT MERGE Fix media scanner uri handling.
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
DO NOT MERGE MTP and media provider support for multiple storage devices:
DO NOT MERGE MountService: Fix running media scanner at boot.
DO NOT MERGE Fix deadlock in MountService
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
DO NOT MERGE MountService: Add support for multiple volumes
2011-05-09 10:53:40 -07:00
The Android Automerger
a8e0709c6d
am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
...
* commit '44e39d608cfddcbf56123480123822f26f20f259':
DO NOT MERGE Handle GET_POWER failures
DO NOT MERGE: Don't send pause again when coming back from full screen
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
DO NOT MERGE MTP: Implement GetThumb command
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
DO NOT MERGE Fix media scanner uri handling.
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
DO NOT MERGE MTP and media provider support for multiple storage devices:
DO NOT MERGE MountService: Fix running media scanner at boot.
DO NOT MERGE Fix deadlock in MountService
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
DO NOT MERGE MountService: Add support for multiple volumes
2011-05-09 10:40:14 -07:00
The Android Automerger
1d09b2b69a
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
2011-05-08 22:38:02 -07:00
The Android Automerger
5451520bd5
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2
2011-05-08 22:11:52 -07:00
Mathias Agopian
694525286a
Merge "clear boot-animation background with black (not transparent) pixels"
2011-05-06 19:23:16 -07:00
Scott Main
bf42144ee8
am 5033d2b5: am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
...
* commit '5033d2b5287c48ac46a368ea85f080cfba0ccc8d':
docs: update sdk tools sums and sizes based on candidate 5
2011-05-06 17:27:39 -07:00
Scott Main
8679a1bbb6
am 5de8226c: am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
...
* commit '5de8226cc7caea7a52d9f2538f87d2cc34214ad0':
docs: update sdk tools sums and sizes based on candidate 5
2011-05-06 17:25:38 -07:00
Scott Main
88b4a6cbf6
am 5cf78ecd: docs: update sdk tools sums and sizes based on candidate 5
...
* commit '5cf78ecd2c523be442f52888ca613b9a92325a6c':
docs: update sdk tools sums and sizes based on candidate 5
2011-05-06 17:22:34 -07:00
Scott Main
245b920dac
am dcb6bd62: am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard
...
* commit 'dcb6bd62cd4d7874d17a4f1b47b343dd88c4546a':
docs: update screens dashboard and add opengl dashboard
2011-05-06 17:10:58 -07:00
Scott Main
3d102050c3
am 71a73dab: am b6451228: docs: update screens dashboard and add opengl dashboard
...
* commit '71a73dab704df2c536bbd4c16454cdcdc472fce2':
docs: update screens dashboard and add opengl dashboard
2011-05-06 17:08:06 -07:00
Scott Main
efa8aef94c
am b6451228: docs: update screens dashboard and add opengl dashboard
...
* commit 'b6451228526288b158c3b0bf0c5abbd5b072d51c':
docs: update screens dashboard and add opengl dashboard
2011-05-06 17:05:42 -07:00
Robert Greenwalt
6828aaea6e
am 56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
...
* commit '56e8e0bc8008d2bd60f04fc78ff036236a44f598':
Fix 2 functions getting connections up by apnType
2011-05-06 16:29:39 -07:00
Robert Greenwalt
46cf1db334
am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
...
* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
Fix 2 functions getting connections up by apnType
2011-05-06 16:25:39 -07:00
Robert Greenwalt
e4c1b85e7f
Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
2011-05-06 16:21:06 -07:00
Marco Nelissen
d052cad60f
Merge "Remove MediaStore.Audio.AudioColumns.ALBUM_ART"
2011-05-06 15:13:44 -07:00
Robert Greenwalt
068504c6b8
am 04f2ad1c: am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE
...
* commit '04f2ad1ce1378e115940ecc7ab49ed3b929795dc':
Mark a disable apn so we don't reconnect.
2011-05-06 15:07:52 -07:00
Robert Greenwalt
e5dba76ed8
am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE
...
* commit '2499da83cb3db5f1d87a52e3e390139c98ff4210':
Mark a disable apn so we don't reconnect.
2011-05-06 14:57:08 -07:00
Robert Greenwalt
0630fc5e75
Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE
2011-05-06 14:52:45 -07:00
Chet Haase
aeb8f81e6d
Merge "Fix for scaled AA lines"
2011-05-06 13:51:09 -07:00
Gilles Debunne
8ba6e762a9
Merge "All SuggestionSpans are removed when the window loses focus."
2011-05-06 10:52:23 -07:00
Alex Sakhartchouk
e909d6ec80
Merge "Moving samplers behind the hal."
2011-05-06 10:40:49 -07:00
Scott Main
ae0e0a9555
am 8f95753c: am 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc
...
* commit '8f95753c35d66c74caef99aaf15c2e0b79fef413':
docs: de-new the dev guide toc
2011-05-06 10:13:07 -07:00
Scott Main
f72e4ed1cd
am 6c6b62e0: am 223a94d2: docs: de-new the dev guide toc
...
* commit '6c6b62e04d1953916637be7fc96d83dde68da801':
docs: de-new the dev guide toc
2011-05-06 10:09:04 -07:00
Scott Main
ddfdd61b38
am 223a94d2: docs: de-new the dev guide toc
...
* commit '223a94d2effd0ba9ef205d0bb790a5bdfb4d54c0':
docs: de-new the dev guide toc
2011-05-06 10:05:56 -07:00
Scott Main
7b3120254d
am 9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
...
* commit '9603fdeecdf5417041aa68cc61a0373f33b74daa':
docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 09:01:13 -07:00
Scott Main
e995926962
am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
...
* commit '0d560d454b88d52a3b48cbc3c3be27e563b7f098':
docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 08:50:50 -07:00
Scott Main
35927d110f
am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
...
* commit '9f7054fea28e65ae1bf8bc1114090306979ba657':
docs: add package description for mtp and a little more info to MtpDevice
2011-05-06 08:41:57 -07:00
Scott Main
f17cb2110c
Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
2011-05-06 08:31:40 -07:00
Wu-cheng Li
febe83586b
Merge "Improve camera javadoc."
2011-05-06 00:13:47 -07:00
Adam Powell
d2708dc62d
Merge "Fix bug 4383987 - animate action modes with split action bars"
2011-05-05 18:44:30 -07:00
Scott Main
cbe856dcf2
am 4739144b: am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
...
* commit '4739144b1ccdd97598bf99dbddb4db4c41150d74':
docs: version notes for tools 11
2011-05-05 18:39:15 -07:00
Scott Main
23f82b0801
am 8ce58e50: am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
...
* commit '8ce58e5062288c95887bd56fc959527814052b56':
docs: version notes for tools 11
2011-05-05 18:36:59 -07:00
Scott Main
68328dcefc
am f88b52fb: Merge "docs: version notes for tools 11" into honeycomb-mr1
...
* commit 'f88b52fbf693d8b17e57a9d2fdda5a29e1bfa8d9':
docs: version notes for tools 11
2011-05-05 18:34:42 -07:00
Scott Main
4a30e130f6
Merge "docs: version notes for tools 11" into honeycomb-mr1
2011-05-05 18:32:42 -07:00
Scott Main
cd7dd0ae21
am d81214da: am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
...
* commit 'd81214dae45a4b38919296af41bf756e3931675a':
docs: add package description for RTP
2011-05-05 18:04:28 -07:00
Scott Main
1f42155306
am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
...
* commit 'a7a9c4cbbc2315a59ad27b43c83c66e272dcc2f2':
docs: add package description for RTP
2011-05-05 18:02:47 -07:00
Scott Main
be32882b54
am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
...
* commit '46524f83a55731cd96c9df8a87be6dacb1db1a37':
docs: add package description for RTP
2011-05-05 18:00:57 -07:00
Scott Main
6f8e3cdcc0
am 2cd90733: am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
...
* commit '2cd90733cc17dcebb682d82f9dcf847877627043':
docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
2011-05-05 17:59:27 -07:00
Scott Main
f9fb9b04c3
Merge "docs: add package description for RTP" into honeycomb-mr1
2011-05-05 17:59:24 -07:00
Scott Main
aaa4662450
am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
...
* commit '7bf1c661f1a43236dd075616f4f04a776710dcb0':
docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
2011-05-05 17:56:50 -07:00
Scott Main
64cb372303
am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
...
* commit '034d89d9a4b56014ea198bcdeaa5ad922608ae40':
docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs
2011-05-05 17:53:57 -07:00
Daniel Sandler
de802a7c0e
Merge "Consolidate notification layouts by removing xlarge versions."
2011-05-05 17:07:59 -07:00
Wink Saville
c8a69ccfb7
am 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
...
* commit '3bebae4332144004db9f774bfde1abcd6c656b2c':
Add Delay for data connection retry.
2011-05-05 16:24:58 -07:00
Wink Saville
5062062dfc
am 0b45723f: am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
...
* commit '0b45723f80ecb6038b15d791650d46f60f70f45f':
DataConnection: Fix handling of PDP setup failure.
2011-05-05 16:24:55 -07:00
Wink Saville
326f2a90e1
am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
...
* commit 'd237d05c6f36d4e514eac95a9bcc07106c3d97eb':
Add Delay for data connection retry.
2011-05-05 16:22:31 -07:00
Wink Saville
c63340f955
am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
...
* commit '8bc60413b9840c7fa724e52f1271936640e97736':
DataConnection: Fix handling of PDP setup failure.
2011-05-05 16:22:29 -07:00