diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-25 15:54:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 15:54:43 +0000 |
| commit | d92a39574e3248b0493bfbf49366632141e6e180 (patch) | |
| tree | dcf703849b6e6745cc06e4f0f13f43043facddb2 /tools/aapt2/diff/Diff.cpp | |
| parent | d2e40fabcaddb9c32e0ddaaea8f45519a7d810d5 (diff) | |
| parent | eee604ff8bd76bc2a4f00b6612e92047bfe95d80 (diff) | |
am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev
* commit 'eee604ff8bd76bc2a4f00b6612e92047bfe95d80':
BatteryStats: Decode wakeup reasons in Java
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions