OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95af699 20d68e0)
resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce am...
authorMarco Nelissen <marcone@google.com>
Mon, 13 Feb 2017 23:32:46 +0000 (23:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Feb 2017 23:32:46 +0000 (23:32 +0000)
am: 20d68e02bc

Change-Id: I82a161a19d36f937e6302659d9f4338d7b3cbf1d


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