diff options
| author | Romain Guy <romainguy@android.com> | 2010-02-18 11:02:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-18 11:02:11 -0800 |
| commit | 011c440b9d359bfc1e3d24f8e0445aaa4045cfe1 (patch) | |
| tree | bbc8c1418ad13bc3fade1747213d7fda24113367 /tools/aapt2/diff/Diff.cpp | |
| parent | eca5c293c66f1119774e7445d01f68fd2d299913 (diff) | |
| parent | 6c71d476f32adb5308a2a9e32660b66b2b7e6c1a (diff) | |
am 6c71d476: (-s ours) am 8368ef0b: Manual merge of 40080 DO NOT MERGE Properly notifies listener when an animation is cancelled. Bug: #2428005.
Merge commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a'
* commit '6c71d476f32adb5308a2a9e32660b66b2b7e6c1a':
Manual merge of 40080 DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions