tree 6b2432a5a4fd74969e3c6203842dade1c98e1d91
parent 70ff5f8fa1d349118cc1d154aa429e5c0812ab35
parent 2a6b3d4db19711c56081291bfdc012e9e2a10092
author Jason Monk <jmonk@google.com> 1466602341 +0000
committer android-build-merger <android-build-merger@google.com> 1466602341 +0000

Merge \"Update battery content descriptions with labels\" into nyc-dev
am: 2a6b3d4db1

Change-Id: Id0d36f67615bd319351ba2bdc3c2993a3162e665