summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/BatteryManagerInternal.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-10-31 21:43:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-31 21:43:21 +0000
commit486384ef46ead8e05fbf4cdb1c1b48e3a559d281 (patch)
treebd9fd2f5c0d278f457bf4389a384778df7219c9a /core/java/android/os/BatteryManagerInternal.java
parent3bfcae769faa523390c28adc149afd9d070ff12d (diff)
parent0d6624d35af7c7623cf97084753255079b01fbdf (diff)
downloadframeworks_base-486384ef46ead8e05fbf4cdb1c1b48e3a559d281.zip
frameworks_base-486384ef46ead8e05fbf4cdb1c1b48e3a559d281.tar.gz
frameworks_base-486384ef46ead8e05fbf4cdb1c1b48e3a559d281.tar.bz2
am 0d6624d3: am fa21e757: Merge "Ensure views are attached prior to starting enter transition." into lmp-mr1-dev automerge: 7bce500
* commit '0d6624d35af7c7623cf97084753255079b01fbdf': Ensure views are attached prior to starting enter transition.
Diffstat (limited to 'core/java/android/os/BatteryManagerInternal.java')
0 files changed, 0 insertions, 0 deletions