OSDN Git Service

Merge "batterymeter -> just meter." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Tue, 23 May 2017 17:42:43 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 17:42:43 +0000 (17:42 +0000)
am: da4c81d942

Change-Id: I6500c46fc1b0fcbe290e9d610ac6506458ab9fca


Trivial merge