diff options
author | Haibo Huang <hhb@google.com> | 2021-03-03 23:42:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 23:42:42 +0000 |
commit | 45b069f0156c47375a7efd92253f553f085ab3f0 (patch) | |
tree | 9a3ed576db1d73095b4f770f454a3df7ab79e60c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | dfe2cc04ac29d580f2641f3a9951cecd54013ffc (diff) | |
parent | 14fff93b3fbab6d5ba94a27a692a06c414bbdde7 (diff) |
Merge "[bit] Use new jsoncpp API" am: c8379556c0 am: 14fff93b3f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607474
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85d3d40d604a8cc7856f4c5f7de80607fc6fa1ea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions