diff options
| author | Adam Seaton <aseaton@google.com> | 2016-08-23 00:13:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-23 00:13:04 +0000 |
| commit | fcd16254c6f0bb0a769c52280ad5ae8a2a5d03b2 (patch) | |
| tree | cdcfae7fa35c2d3ba2e022b035d7258cbc002ff4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 27d769e3b0949652d154e5ef142a869d404b5c9b (diff) | |
| parent | 0f1e7ab1d357d4ab911544c4224873dffebdad15 (diff) | |
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev
am: 0f1e7ab1d3 -s ours
Change-Id: Ic46aeb12f03e20c3379740934b4c80b228499124
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions