summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-11-11 22:27:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-11 22:27:45 +0000
commit32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9 (patch)
treebcaa623d3f45b6e98f2cbb156d19467a5ef66585 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentda772234f6f9498bf02f31448bda16e9fcbd6bd2 (diff)
parent5ce1cb240b13db98fbdc21e1ef069b5f9cec8d72 (diff)
Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions