OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 773f1b2 204c2de)
am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
authorJim Miller <jaggies@google.com>
Wed, 15 Jul 2015 22:11:11 +0000 (22:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:11:11 +0000 (22:11 +0000)
* commit '204c2de8bb2a804991b8bbd5be9877ac1a52e150':
  Improve tracking of screen on reasons.


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