OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cad889 36401a3)
resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp
authorVladimir Marko <vmarko@google.com>
Thu, 8 Jan 2015 10:46:53 +0000 (10:46 +0000)
committerVladimir Marko <vmarko@google.com>
Thu, 8 Jan 2015 10:46:53 +0000 (10:46 +0000)
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7


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