OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c34699a 206f3ea)
am 50a7d635: am 0dfd0ee9: Merge "Handle cases for going to SHADE_LOCKED" into lmp-dev
authorJorim Jaggi <jjaggi@google.com>
Mon, 28 Jul 2014 14:01:35 +0000 (14:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Jul 2014 14:01:35 +0000 (14:01 +0000)
* commit '50a7d635bea75cff02c0f2d557b8a8b84fa9debd':
  Handle cases for going to SHADE_LOCKED


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