tree f1a91f4089ea24dea0d4ce26dc3f950867205e93
parent e2ad62f797d794717790ee955c09dd378a4c74bf
parent 0bf62f1309fc279039b98a5faaa999ac95f9ee24
author Chih-Hung Hsieh <chh@google.com> 1546633201 -0800
committer android-build-merger <android-build-merger@google.com> 1546633201 -0800

Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings" am: cdf6be573f am: d42fe48c93
am: 0bf62f1309

Change-Id: Iffb7e4a145b172a35dd58b9450d4a5184d8b07f7