69d9ad653a28f6bb85daa97abde9e20e77ef3c76
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
am
ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE
am
9603fdee: am 0d560d45: am 9f7054fe: Merge "docs: add package description for mtp and a little more info to MtpDevice" into honeycomb-mr1
am
56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
am
d81214da: am a7a9c4cb: am 46524f83: Merge "docs: add package description for RTP" into honeycomb-mr1
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%