OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20062e9 e663817)
Merge \\\"Don\\\'t use sp<>&\\\" into klp-dev am: 598f8d3218 am: 0ee3710873
authorMarco Nelissen <marcone@google.com>
Thu, 9 Jun 2016 00:06:26 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 00:06:26 +0000 (00:06 +0000)
am: e66381758d  -s ours

Change-Id: Ie7422768422714cd1c88d2c9c52d7d682157bb4a


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