summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-12-02 02:51:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 02:51:51 +0000
commitf5163cec8856359437ae4f3aa7ff60c28f3ffb66 (patch)
tree92f878daba3b099e8a8c0b407a68260ee7a88a37 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent73cca90f8d66301c180322f8e9a8c7fda9b0e8de (diff)
parent6dcaedf61ece5ec94c1de5e98d2b7c6d9db9d423 (diff)
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions