OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51942be 836476d)
resolve merge conflicts of 836476d90d to mnc-dr2-dev-plus-aosp.
authorElliott Hughes <enh@google.com>
Wed, 9 Dec 2015 01:17:48 +0000 (17:17 -0800)
committerElliott Hughes <enh@google.com>
Wed, 9 Dec 2015 01:17:48 +0000 (17:17 -0800)
Change-Id: I8ae0ceb96f8bfe706cdaa4a512bf52935667600c


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help