OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2516931 635c991)
am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into...
authorTodd Kennedy <toddke@google.com>
Thu, 27 Aug 2015 10:44:33 +0000 (10:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:44:33 +0000 (10:44 +0000)
* commit '635c9915e64c69bdf9b5d1a9923b7085d146ba64':


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