diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-11-29 03:50:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-29 03:50:31 +0000 |
| commit | 76725902d14247c9333308eddc98c8b95e431aaf (patch) | |
| tree | 7c59a40dfab1a7fd4f7fbd63a3cd556af0d52087 /tools/aapt2/diff/Diff.cpp | |
| parent | b6504180ec858ab34c8d46f45684d2b2fce692da (diff) | |
| parent | a89cdda201a1cdb7311f85fac89c284a0cce2e42 (diff) | |
Merge changes from topic 'am-2f7a5b3d426742748bd60ca695e3c03a'
* changes:
Merge changes I37c8daa6,I5a05b65d,If56347fd am: 9309f1cbf3 am: b4248148da am: f9e5488bd1 am: 6edb9856f7
Preload2: Add isSingleThreaded am: 3bf65c916c am: 57c14c8ee6 am: 80ae2ed225 am: 190dbbd0af
Preload2: Fix action inheritance am: 1c809a3d32 am: 24cd3418c7 am: 2b34ac2bd6 am: 26c94b7430
Preload2: Abstract out UI am: 5cb8998363 am: 826ec71e96 am: eab0eadbf6 am: af5b2c3010
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions