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