summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2014-03-10 17:08:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 17:08:24 -0700
commitaaf23a9a653457cccf54293b2ff76196718c7a1a (patch)
tree609ed3e64ac7dc59351bae8eac6d849e8f8e4cf8 /core/java/android/widget/ImageView.java
parente7f7af964baa3c5d36abd163e33ad139310049d2 (diff)
parentc3f5d694324fbe2831405ce60bc43bd0d0183d07 (diff)
downloadframeworks_base-aaf23a9a653457cccf54293b2ff76196718c7a1a.zip
frameworks_base-aaf23a9a653457cccf54293b2ff76196718c7a1a.tar.gz
frameworks_base-aaf23a9a653457cccf54293b2ff76196718c7a1a.tar.bz2
am c3f5d694: Merge "Hang off call by power button while screen is on"
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07': Hang off call by power button while screen is on
Diffstat (limited to 'core/java/android/widget/ImageView.java')
0 files changed, 0 insertions, 0 deletions