OSDN Git Service

Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Fri, 17 Jun 2016 20:20:54 +0000 (20:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 20:20:54 +0000 (20:20 +0000)
am: b2728f51fb

Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea


Trivial merge