summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2015-01-08 16:15:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-08 16:15:47 +0000
commit7628fac99fb23b71ae418b9833bc7e5d534c1e9a (patch)
tree8c16ba4f0ff28b666cfc174070fa0d133d76d475 /tools/aapt2/java/JavaClassGenerator.cpp
parent371d77ecf684163b3bd1061e00191980f1fc90a1 (diff)
parentc9a76941ecca457e6a17b06f557c24e18e3bdafa (diff)
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge: d656955
automerge: c9a7694 * commit 'c9a76941ecca457e6a17b06f557c24e18e3bdafa': Wipe FRP partition if OEM unlock enabled
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions