diff options
author | John Reck <jreck@google.com> | 2016-06-18 02:19:31 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-18 02:19:31 +0000 |
commit | fcf8957586e840fd1d1e7d9e0108a0436011b34c (patch) | |
tree | e22176f49411ca11ba6bd30e739831e16f75f3ec /tools/aapt2/diff/Diff.cpp | |
parent | 2d6e7149e838376658540127c13fc0bdb8db032c (diff) | |
parent | f5159155d0df0a5ff5f471146a5779e675d3a83d (diff) |
Merge \\"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\\" into nyc-dev am: d11b5e6661
am: f5159155d0
Change-Id: I5867dfbdddccc6fd099c9ab20282658ffdb09932
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions