summaryrefslogtreecommitdiffstats
path: root/keystore/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2015-10-08 17:02:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 17:02:38 +0000
commita0ef104882b1a0edd79badb2f327cc8722f76bb2 (patch)
tree03fcc6d59996704c0387ee6499381cd598c75043 /keystore/MODULE_LICENSE_APACHE2
parentedc3585ffd1ce17f12b808f0473ebc582e159132 (diff)
parentd473a1446e520616c4079594bbcf3c6fbe88ed4f (diff)
downloadframeworks_base-a0ef104882b1a0edd79badb2f327cc8722f76bb2.zip
frameworks_base-a0ef104882b1a0edd79badb2f327cc8722f76bb2.tar.gz
frameworks_base-a0ef104882b1a0edd79badb2f327cc8722f76bb2.tar.bz2
am d473a144: Merge "Hold wake-lock during copy operations." into mnc-dr-dev
* commit 'd473a1446e520616c4079594bbcf3c6fbe88ed4f': Hold wake-lock during copy operations.
Diffstat (limited to 'keystore/MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions