OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53841ec 5e9e64c)
am 5e9e64c0: (-s ours) am d4c1861a: Merge "BatteryStats: Fix units in wakelock distri...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 07:41:14 +0000 (07:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:41:14 +0000 (07:41 +0000)
* commit '5e9e64c000b55848ea5d2f812d63fc9bd5d4b41d':


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