summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorKevin Hufnagle <khufnagle@google.com>2016-09-26 23:15:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-26 23:15:20 +0000
commit747354bb540e0faad886c6b4fc8734742b799d19 (patch)
treed4e3fcd2a5bcff58e3fbe372dbcf3f666e819808 /tools/aapt2/diff/Diff.cpp
parentad5cafd283dc2c3785954505fb41d8be8aafaf2c (diff)
parent0b498d613929d35d97c86d590691867f6347204f (diff)
Merge "docs: Added note in LayoutTransition class reference that APPEARING and DISAPPEARING animation timelines cannot overlap" into nyc-dev
am: 0b498d6139 Change-Id: Ice112cfbc819845d1bfd2c885e691e9fe5ecd546
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions