summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2014-11-18 19:12:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-18 19:12:43 +0000
commitd4e55bdfc50635903e04934785ed82c39257506c (patch)
treefbca0f6d6d20dc84836a07548cb3037c8c56c02a /rs
parent9522055f1d10b30158b772885bf4befe06fb2a08 (diff)
parent8f7b84e037e35db9d3b46873bc1adf712b307cbe (diff)
downloadframeworks_base-d4e55bdfc50635903e04934785ed82c39257506c.zip
frameworks_base-d4e55bdfc50635903e04934785ed82c39257506c.tar.gz
frameworks_base-d4e55bdfc50635903e04934785ed82c39257506c.tar.bz2
am 8f7b84e0: Merge "Always wake device on power key from non interactive immediately." into lmp-sprout-dev
* commit '8f7b84e037e35db9d3b46873bc1adf712b307cbe': Always wake device on power key from non interactive immediately.
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions