summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2017-01-01 22:59:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-01 22:59:55 +0000
commit5a35ec90bf1641e80b73652fd305fafcda4ff89b (patch)
tree39d32705bf951e8b7ec94cdcaef1d707399ea41e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0ad19476cb000ca5b3896042f3c9bc7d5dcca767 (diff)
parent7099984f4c3cb6ffa60ef1f93f143ae22187e3d9 (diff)
Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
am: 7099984f4c Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions