OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e356b03 14f2abf)
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)
* commit '0dfd0ee92d7f84a9778e3524bbd37d6679103085':
  Handle cases for going to SHADE_LOCKED


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help