diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-07-27 20:21:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 20:21:20 +0000 |
| commit | 48a90091b1f50043f000929e35d9aae5e8c457e3 (patch) | |
| tree | 43a7d270cf3cec7cc980f73cc74f8ac40415b8a9 /tools/aapt2/diff/Diff.cpp | |
| parent | 3df17a6d01507de4690601f948ec776f48ccba87 (diff) | |
| parent | fc28d6fc9dec30e4cd98cc894d596f7df986f5b9 (diff) | |
am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
* commit 'fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
BatteryStats: Prevent BatteryService from blocking
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions