OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5705c8f f751c1d)
am b81b5176: am eae1f6bb: Merge "Guard against EOF when reading in FileBridge." into...
authorJeff Sharkey <jsharkey@android.com>
Fri, 22 Aug 2014 02:59:21 +0000 (02:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Aug 2014 02:59:21 +0000 (02:59 +0000)
* commit 'b81b51760e627eec388d2bbf9c27c6e8c46e28de':
  Guard against EOF when reading in FileBridge.


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