commit | 5c05a04448307cfa92dd71f2131d6dc581e8b2e1 | [log] [tgz] |
---|---|---|
author | Daniel Nishi <dhnishi@google.com> | Tue May 23 17:42:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 23 17:42:43 2017 +0000 |
tree | d98d1f931eff87ebdcf776ebc366ec14d31fd878 | |
parent | bb354909bd018e7683089ba8930ebd2eed8adadc [diff] | |
parent | da4c81d942081dbe02ecf6d4c2ce9a4edf1c8595 [diff] |
Merge "batterymeter -> just meter." into oc-dev am: da4c81d942 Change-Id: I6500c46fc1b0fcbe290e9d610ac6506458ab9fca