diff options
author | Sooraj Sasindran <sasindran@google.com> | 2017-02-10 05:57:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-10 05:57:13 +0000 |
commit | 186c0839d826e47167b12b3df9b35665fa15c836 (patch) | |
tree | 728802fff6ed88a15c1de12ee13a1ade31369ccd /tools/aapt2/diff/Diff.cpp | |
parent | 4c8fc962dc06fcb2a60560229f1b5a2ffe7e5ad5 (diff) | |
parent | bae8d7a8c4435358379ba1fe2158177f2b1539d6 (diff) |
Merge "Expose api to retrieve wakelock information per client" am: 8fbf6a29d0 am: 730c2d9c72 -s ours
am: bae8d7a8c4 -s ours
Change-Id: I352f7dc305e64fa5e82bd3cccd9015732ab54504
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions