tree bccba1cc67b0dc4a1b245fd2028a6222c7fd2d52
parent 4f0782544ee30646605e724e565c90d038eb2237
parent 3bc677351c1095ba2d350a80235f23dd1ae726e4
author Elliott Hughes <enh@google.com> 1532739602 -0700
committer android-build-merger <android-build-merger@google.com> 1532739602 -0700

Merge "Add METADATA." am: aef68593ba
am: 3bc677351c

Change-Id: I3d00288319570095add071cb400f306bf4f09614