diff options
| author | Robert Carr <racarr@google.com> | 2016-06-15 01:12:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-15 01:12:17 +0000 |
| commit | 5077dd948f4c86fb5b69343bf2f62e592ca3755d (patch) | |
| tree | 989b8004cc0806fecbefb981cf5bd99d3a2f0fbc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6bc69459ed808b1828b5fa786fa7225bbdbec314 (diff) | |
| parent | 3e5df9fb50f98ae3738bef5c8dbddcbbb4a4b95d (diff) | |
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50
Change-Id: I59d035329b3e6acbc929564ba7ce1107943c6587
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions