diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2017-09-01 00:25:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-01 00:25:00 +0000 |
| commit | 4f342f45c2fe32e493486c5fd5e5770ce95dbfeb (patch) | |
| tree | c4a95d0d37ec11aaedecb9f5be0d65102fed6992 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1f7f1129e1f494d00b2f80d6ca0b0fc2722a7713 (diff) | |
| parent | f9ddd9781560a9a654a03ee6f983f486c2a2163d (diff) | |
Merge "Fix transition between two occluding activities" into oc-mr1-dev am: 8e2615c372
am: f9ddd97815 -s ours
Change-Id: Ie871ce7d3e77af215ac36c42aa0e848ac2bc1838
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions