summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-23 18:18:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-23 18:18:53 +0000
commit9ab9573a2235bc231988c62155040517bbd0b6e8 (patch)
tree3af09c6e2ee3e9bf5ed8df406f32039f22b9afac /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta6611e989b404ed93cfc20b060f4cb80a37e1cc4 (diff)
parentbba2bb74ce100558a96ab189fb14a531a19e109a (diff)
Merge "Merge "Fixed flicker when docking task from recents." into nyc-dev am: bc0a5cb2f8 am: 342065cc95" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions