summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2016-06-20 18:20:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 18:20:10 +0000
commitca6972f403f97ed3e176391717fb3ec7d59ce496 (patch)
treea805195869e85adf90e901cfbea2a67a919bac97 /tools/aapt2/diff/Diff.cpp
parent35c889de71643d7bda3a466ed150c7cedfdfe67e (diff)
parent168e07a6b364adce0bb6f49c7fc2af4fc7dbee4d (diff)
Merge \\"Make sure fontScale in configuration sent to app is equal to global\\" into nyc-dev am: 7c6692646c
am: 168e07a6b3 Change-Id: I6f815a171e1b0ac0c5446e8c9f80d63ee3abfa09
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions