tree 6b1b6a3eb885e9c8795fc48b4d24925731bb25d7
parent 2e50200c016b05eb1abb6e8007b161f5e901ac70
parent d0a0cb32bf42671da4f5089feca05e3728bd0d0c
author Chris Wren <cwren@google.com> 1498756037 +0000
committer android-build-merger <android-build-merger@google.com> 1498756037 +0000

Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev am: 325706f143
am: d0a0cb32bf

Change-Id: Ie3a0c67fd2ce92098771b3fff27f61db016f2828