summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-07 23:35:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-07 23:35:47 -0700
commite71a630fc6f9e0c19490a2645ad9ff0c315c4e95 (patch)
treeb3f28d128cf1299d7b85158346d4e4964e6ccaeb /services
parentf0b8e3adc4031898714e81f4beafedaa13546978 (diff)
parentec799e883cb309fc12f22cab19e53f1e27886ba5 (diff)
downloadframeworks_base-e71a630fc6f9e0c19490a2645ad9ff0c315c4e95.zip
frameworks_base-e71a630fc6f9e0c19490a2645ad9ff0c315c4e95.tar.gz
frameworks_base-e71a630fc6f9e0c19490a2645ad9ff0c315c4e95.tar.bz2
am ec799e88: Merge "More on #7296510 Transition from lock screen to dreaming is really bad" into jb-mr1-dev
* commit 'ec799e883cb309fc12f22cab19e53f1e27886ba5': More on #7296510 Transition from lock screen to dreaming is really bad
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions