OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6104a74 e66fa5c)
am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile."
authorNarayan Kamath <narayan@google.com>
Fri, 17 Jan 2014 19:23:12 +0000 (19:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jan 2014 19:23:12 +0000 (19:23 +0000)
* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
  Fix error checking in MemoryFile.


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