OSDN Git Service

am 0dfd0ee9: Merge "Handle cases for going to SHADE_LOCKED" into lmp-dev
authorJorim Jaggi <jjaggi@google.com>
Mon, 28 Jul 2014 13:55:59 +0000 (13:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Jul 2014 13:55:59 +0000 (13:55 +0000)
commit206f3ea34a7be8b4c7c409cda103eefd5ad12163
treee07178284524ec8d6161d9be428a25dc5134e095
parente356b03046d5fdef7fae5c04a45027a8e6d987f9
parent14f2abff289e4a13d0a096cd73744c6366106f52
am 0dfd0ee9: Merge "Handle cases for going to SHADE_LOCKED" into lmp-dev

* commit '0dfd0ee92d7f84a9778e3524bbd37d6679103085':
  Handle cases for going to SHADE_LOCKED