diff options
author | Suprabh Shukla <suprabh@google.com> | 2016-08-16 00:32:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-16 00:32:56 +0000 |
commit | ae54fae4533b3f0e12a205898dd77a5b28cdcca4 (patch) | |
tree | 8d708463d9334ef69ce911af842c3fc4f39de1d2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 925a30e82be4b7af257d0b3df012f026201272b6 (diff) | |
parent | f5e51cf7a9417e1c06dbbb9547020c20ff7517f8 (diff) |
Merge "Changing user inactivity and warning dialog timeouts" into nyc-mr1-dev
am: f5e51cf7a9
Change-Id: Ic44c61742ba56f887cf90ab6428b8c8642e355e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions