OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53edaff ce61bb6)
am ce61bb6a: (-s ours) am 52a9a61b: am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 19:34:04 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 19:34:04 +0000 (19:34 +0000)
* commit 'ce61bb6abd09be5b49a8e95905243d75a1e9abcf':
  Fix build break DO NOT MERGE


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