OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7a3fd6 f91fa23)
Merge "Update path to camera ndk headers" am: 9d7eff8334 am: 334bca910c am: 344a7212f...
authorColin Cross <ccross@android.com>
Fri, 5 May 2017 23:07:09 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 May 2017 23:07:09 +0000 (23:07 +0000)
am: f91fa2372e  -s ours

Change-Id: I49a98fe9946fe3450f678251af65dd92e66cdcb9


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