OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c080bd b30f841)
am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev
authorAdrian Roos <roosa@google.com>
Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Jul 2015 19:20:22 +0000 (19:20 +0000)
* commit 'b30f841cb44e132598939b0797dad41f6c0004a7':
  Touch, wake and unlock


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