summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-07-21 19:26:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-21 19:26:45 +0000
commit23e19066de2caf1db1fa0759ac49a1118b59f7a5 (patch)
treed798e019f8f219b60beee5e7106df9b83621d817 /keystore
parentd9c2ff99bf9469f155eabf341880d055741e9db5 (diff)
parent6856964444d0bb0fee6d7f62ae3f443f67244514 (diff)
downloadframeworks_base-23e19066de2caf1db1fa0759ac49a1118b59f7a5.zip
frameworks_base-23e19066de2caf1db1fa0759ac49a1118b59f7a5.tar.gz
frameworks_base-23e19066de2caf1db1fa0759ac49a1118b59f7a5.tar.bz2
Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions