tree 20a4af340cb96f2b913df09cde4c1d81301e8409
parent d1529cc8c89c6e72d48ac27e071c1f33dbf267b7
parent a1c0af2385bffeb7bafc7eaa0c5ab6f068bf1627
author Chih-hung Hsieh <chh@google.com> 1535064244 -0700
committer android-build-merger <android-build-merger@google.com> 1535064244 -0700

Merge "Use simpler per-file syntax." am: 9045aa89e5 am: f02915fe87
am: a1c0af2385

Change-Id: Id887e3bd9af2e3f2b99378d47e5187c5f7e25d24