summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-01-31 21:04:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-31 21:04:35 +0000
commit81860bdc55e99c3bfb5f755190f57a1affdc2e5b (patch)
tree2fd43beb853e7549e33d164db4ba67117d1b3940 /tools/aapt2/diff/Diff.cpp
parent28e3bfebd84969fa7a52aecfd4789e31deb79b11 (diff)
parentdbd3d4e5dfebaee26f793d1b30583af9748ecb48 (diff)
Merge "Merge "Correct the formula of battery capacity estimation. am: c800ddc824 am: d4d476943f" into nyc-mr2-dev-plus-aosp am: c820fe9b16"
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions