tree 11c7f568a1d7861421136c2b3872b9036b4c34cb
parent 192d5037c9afea642c077cbc4540974e494f20e0
parent 0deb91b779f3c05cdb63aa625cdce8879f8308dd
author Bill Yi <byi@google.com> 1513217017 +0000
committer android-build-merger <android-build-merger@google.com> 1513217017 +0000

Merge "Add metadata" am: bd454345fe am: 980d7b00ee
am: 0deb91b779

Change-Id: I9e137eeef9c00f6678296ee92e054e8453d030d3