OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77f7169 0d5c30d)
am 0d5c30d9: (-s ours) am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 06:43:47 +0000 (06:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:43:47 +0000 (06:43 +0000)
* commit '0d5c30d9ba97997e0ec7bfcc1e267c90beb108c4':


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