summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2015-11-13 17:47:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-13 17:47:32 +0000
commit0fb9e4f535132f9e8baa8fc1e02143bf423098e8 (patch)
tree7445a76adf9b4c56085526ce54127506c1aed771 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent371df36b5c24bb7d6b6dbdb6b8aaf8b45ec208b1 (diff)
parentf9661eafa0de1e9fe0bdf12d8c23ad087ece8729 (diff)
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev am: fe482e0bca am: 0e6007d229
am: f9661eafa0 -s ours * commit 'f9661eafa0de1e9fe0bdf12d8c23ad087ece8729': Initialize DisplayContent base info when object is constructed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions