OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2610f5f 8e28c9c)
am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into lmp-dev
authorJeff Sharkey <jsharkey@android.com>
Fri, 22 Aug 2014 01:12:23 +0000 (01:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 01:12:23 +0000 (01:12 +0000)
* commit 'eae1f6bbe878b9b03602ff1f0dab56a79f069068':
  Guard against EOF when reading in FileBridge.


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