diff options
| author | John Reck <jreck@google.com> | 2016-06-18 03:10:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-18 03:10:40 +0000 |
| commit | 2e5e642b9ce4387ecac3a035705044b6fa8c63cc (patch) | |
| tree | da8b08415a0e2573798494bda2d208cccacaf5e9 /tools/aapt2/diff/Diff.cpp | |
| parent | c39dbae0ccaf6c3cc1005d0d7ec3a955b8103cc8 (diff) | |
| parent | 1450121bb3aa84c8d1b6e1a6b8ae31dd37fd5599 (diff) | |
Merge \\\"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\\\" into nyc-dev am: d11b5e6661 am: 1ef9b355b0
am: 1450121bb3 -s ours
Change-Id: Ie48228b447fb029a646aa9e55b41ff27957fad57
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions