commit | 2921780f71bb269d96c444b282ef0b633f22f559 | [log] [tgz] |
---|---|---|
author | John Spurlock <jspurlock@google.com> | Fri May 30 23:55:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 30 23:55:56 2014 +0000 |
tree | bef7d107dc6f970e994d1c42b69bb4638032c6de | |
parent | 43e15653706d667a722a3b813ea89917d00ed42a [diff] | |
parent | b8a0feed0406e91eaa6f5bee223bc9316171c2b6 [diff] |
am 2a8f11a5: Merge "Resurrect global actions, remove confirmation for Power off." into lmp-preview-dev * commit '2a8f11a57053e52c2d0aa17c31b1c021ba0d78b8': Resurrect global actions, remove confirmation for Power off.