OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb4b03c d7e8d9a)
am d7e8d9a7: Guard against malformed files
authorMarco Nelissen <marcone@google.com>
Wed, 11 Jun 2014 17:02:40 +0000 (17:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 17:02:40 +0000 (17:02 +0000)
* commit 'd7e8d9a7393b5429f8f13a6794b9b04d37390fb5':
  Guard against malformed files


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