| commit | d0a0cb32bf42671da4f5089feca05e3728bd0d0c | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@google.com> | Thu Jun 29 16:58:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 29 16:58:45 2017 +0000 |
| tree | 7f3be4b859a63c71e193a7d2481f16c3243987f0 | |
| parent | f55beccb2f3b36b4a9159e6317d52f0eedd4560b [diff] | |
| parent | 325706f14331b5e88ce1ca1b519720a510cfd70e [diff] |
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev am: 325706f143 Change-Id: I0a597ec06a40f97dea3edcd8a4807040c742b1d9