summaryrefslogtreecommitdiffstats
path: root/rs/java/android
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-23 22:00:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-23 22:00:07 +0000
commitf6a5fd39a01c7a3fe49cb3d3c7d1c665059a4eb0 (patch)
tree27d3db8776101d4777c9eb8eb38f574c77d38d92 /rs/java/android
parent8c747cab641839121d054ea23de32dd66e27ff93 (diff)
parent815382c8b6b56501df5da0dfea1db997f431db72 (diff)
downloadframeworks_base-f6a5fd39a01c7a3fe49cb3d3c7d1c665059a4eb0.zip
frameworks_base-f6a5fd39a01c7a3fe49cb3d3c7d1c665059a4eb0.tar.gz
frameworks_base-f6a5fd39a01c7a3fe49cb3d3c7d1c665059a4eb0.tar.bz2
am 8ec7d394: am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev
* commit '8ec7d394252ee801ded0bde940c8f7358cbc9099': Use activity for brightness dialog
Diffstat (limited to 'rs/java/android')
0 files changed, 0 insertions, 0 deletions