OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fce8ea2 b7eebd1)
am b7eebd17: am 9466fa27: (-s ours) am c96e6f19: Merge "BatteryStats: Use proper...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 18:46:27 +0000 (18:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 18:46:27 +0000 (18:46 +0000)
* commit 'b7eebd17017b772f3ecef690748f9cdbee565f02':


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