summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-01-23 00:55:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-23 00:55:23 +0000
commitac829206a9ce5a98d3ebab5858f302d48db202bf (patch)
tree0a5c0be88b96b3bbe9c3a84b7b7ca39c8acdf9e2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd31c16457a7360bc892d71c308c7ab76cdb45af1 (diff)
parent92baed1212dffcae042a33f5575f99d3e00f81c8 (diff)
Merge "Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)" into lmp-mr1-dev automerge: 7fde5e5 automerge: 0ec0465
automerge: 92baed1 * commit '92baed1212dffcae042a33f5575f99d3e00f81c8': Camera2: StreamConfigurationMap#isOutputSupportedFor(Surface)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions