diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-15 02:29:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-15 02:29:52 +0000 |
commit | c122011115a868053d0f51bc58b2a707b0b7aaec (patch) | |
tree | 1a4a1980ae06af985203e117f525c9ad12a80b49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d07b34774c63e8c3a84a5e32ed617dc1459d6515 (diff) | |
parent | 95434b51af894da6cbbbe58cce90dd883c5b0384 (diff) |
Merge "DO NOT MERGE ANYWHERE: Allow NetTransitionWakelock to be overridden via Settings" into oc-wear-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions