tree c74af690abc65a798dafe8f3f342def05f330215
parent e1fca1be6e3f12a1451055d6e869d3892d581e97
parent 0fbcf57edf839d49da342e8851e98763e0d8efe8
author Amin Shaikh <ashaikh@google.com> 1559165173 -0700
committer android-build-merger <android-build-merger@google.com> 1559165173 -0700

Merge "Add battery estimate to content description." into qt-dev
am: 0fbcf57edf

Change-Id: I71f495f74139645325102bdb3e1fe94e7012c17a