OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5000a95 0a5500a)
am 0a5500a8: resolved conflicts for merge of 0dd1a828 to master
authorJohn Spurlock <jspurlock@google.com>
Tue, 4 Mar 2014 22:39:54 +0000 (14:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Mar 2014 22:39:54 +0000 (14:39 -0800)
* commit '0a5500a8fc6040e556f25c1235ec010e1c74866d':
  Volume panel should not clear system ui flags.


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