summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-02-05 22:11:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-05 22:11:32 +0000
commiteb6f3f885154914eec6a747265d1f568ae50380c (patch)
tree3d2a3cd1a3c15e73e8f73930204451833a48d91d /core/java/android/app/ActivityThread.java
parent4eed340437d23a9b4fabf2881557325b863af23c (diff)
parent69a62a8b0df71b0a26d55c29c71dd311dbe174c7 (diff)
downloadframeworks_base-eb6f3f885154914eec6a747265d1f568ae50380c.zip
frameworks_base-eb6f3f885154914eec6a747265d1f568ae50380c.tar.gz
frameworks_base-eb6f3f885154914eec6a747265d1f568ae50380c.tar.bz2
am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev
* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7': Update preference dialog padding to Material
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
0 files changed, 0 insertions, 0 deletions