tree 99fd7e9bb1f73d04aa11ef96fdb26b8b19196aa8
parent a42eb5121a6294ca7d8010163f65a5880b4c5089
parent cd8d440128b7ee653d80509faa6132684dfb0b38
author zachh <zachh@google.com> 1510077063 +0000
committer android-build-merger <android-build-merger@google.com> 1510077063 +0000

Merge "Reorganized assets."
am: cd8d440128

Change-Id: Icae49762890bd9533fdaa0a2f7c85adc0302352b