OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 186993d bb64d2f)
am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 19:17:50 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 19:17:50 +0000 (19:17 +0000)
* commit 'bb64d2fb9e458c9bde66dbc79d88462b7db2b652':
  Fix build break DO NOT MERGE


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