diff options
| author | The Android Automerger <android-build@android.com> | 2011-05-09 10:53:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-09 10:53:40 -0700 |
| commit | 69d9ad653a28f6bb85daa97abde9e20e77ef3c76 (patch) | |
| tree | 352acaa5576de06831cd43a906654a4dfe6f8dc8 /keystore | |
| parent | 9aabb95781bee6a44684a6f6feb155e115d24983 (diff) | |
| parent | bdaa3abdf264372f337cfa9236e53b1e3cfde525 (diff) | |
| download | frameworks_base-69d9ad653a28f6bb85daa97abde9e20e77ef3c76.zip frameworks_base-69d9ad653a28f6bb85daa97abde9e20e77ef3c76.tar.gz frameworks_base-69d9ad653a28f6bb85daa97abde9e20e77ef3c76.tar.bz2 | |
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
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions