tree 86b93ee257002ffe78f06b76725caf71ea3043cb
parent 4e12cd95bee2b02624cdb6db0473c71b5036db6b
parent 47be7bcdbac152cf65b34f4b40e745e1f7dcb4c7
author Tao Bao <tbao@google.com> 1522692861 +0000
committer android-build-merger <android-build-merger@google.com> 1522692861 +0000

Merge "Move a few modules to Soong." am: d408a865af
am: 47be7bcdba

Change-Id: Iba006e5a0df67382f258d1ba60728f4c54003360