diff options
| author | Andriy Naborskyy <andriyn@google.com> | 2016-11-14 14:36:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-14 14:36:57 +0000 |
| commit | b7fae82de83128a1098ae7cfe33fbb0cf528d990 (patch) | |
| tree | 2ce991b339bf8aaba75fe95a644969f55e463f54 /tools/aapt2/diff/Diff.cpp | |
| parent | e38fb5c054889cda422f3e7ce0db6e82bdb685b2 (diff) | |
| parent | fd9358530ad2d13cb47bce28564145a9d815373f (diff) | |
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours am: 0a2ac837d1 -s ours am: 415ec85fdb -s ours am: 5c47b5ec06 -s ours
am: fd9358530a -s ours
Change-Id: I33e0bc9875ab4b078cd79bc6c48b4b098091ace8
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions