summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2016-07-15 21:16:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-15 21:16:36 +0000
commit119840eb91f45334e4c955d400dd779a48c69495 (patch)
tree979fa636049295d6a23573206f5829a17b3df7ed /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdbf15041288c659ab5f16742f4c56eb11b537114 (diff)
parent9a7c3bd577ba1d3ea43082814529ea3d6379d024 (diff)
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
am: 9a7c3bd577 Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions