diff options
| author | The Android Automerger <android-build@android.com> | 2011-05-09 10:40:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-09 10:40:14 -0700 |
| commit | a8e0709c6d4e782512f7f760a5fbf8ed669cb67c (patch) | |
| tree | 89893129a55cf79038adfe36925ed61c6a36a08b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8679a1bbb64adf67f1450bcbe66198216ce77112 (diff) | |
| parent | 1d09b2b69a80cbda03c26675ce9e306e1e9124c6 (diff) | |
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
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions