OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d9491f 18a8124)
am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)
* commit '18a8124f582e9d763670e3bcc6ef6b2b00c4d394':
  DO NOT MERGE Fail more gracefully on allocation failure


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