tree 99fd7e9bb1f73d04aa11ef96fdb26b8b19196aa8
parent f64bc1f8d7d12e41280712196450d8fda2f7b8b0
parent d959ff62b6f5df0dfc16cd1ab45c81e0d817eff4
author zachh <zachh@google.com> 1510077268 +0000
committer android-build-merger <android-build-merger@google.com> 1510077268 +0000

Merge "Reorganized assets." am: cd8d440128
am: d959ff62b6

Change-Id: Ica568e2c1993a73cc1828c3d09ec3e53ed0e110a