summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-02-14 01:58:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-14 01:58:41 +0000
commit2d9a5ce0046bf84ae0784a061ebe3854cb0b8b2d (patch)
treef110bb1244d793723e1581cf64b26d95dcd1b17c /tools/aapt2/java/JavaClassGenerator.cpp
parent29f341a2bb339a631fd298c863ccaaf8c47b4c33 (diff)
parentbe49b2080f9fd56428a33649c762d05c75bd1b7c (diff)
Merge "Merge "Add simActivationState to PhoneStateListener" am: 132842efc9 am: b206f5b382 am: 60ca278b7f am: b4f9ceb912 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions