OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19694a0 ddf5318)
resolved conflicts for ddf53180 to stage-aosp-master
authorChristopher Wiley <wiley@google.com>
Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)
committerChristopher Wiley <wiley@google.com>
Mon, 14 Sep 2015 14:34:50 +0000 (07:34 -0700)
Change-Id: I265ab876ef29dc731e6abb6f964c10f2e71324be


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