OSDN Git Service

am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlie...
authorBrian Carlstrom <bdc@google.com>
Tue, 16 Jun 2015 23:25:53 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jun 2015 23:25:53 +0000 (23:25 +0000)
commit8453e361881f0d16e9fae88ca837fbcb0138c3f3
tree1e3535a9dc35011cb483aec38ccbbdb9e8c5431f
parent1a1a109936f01dde65026d56feeb9a2074956082
parent99c1009a897834e8282a59c0dda8f29dd33234e4
am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
  dex2oat should show something friendlier in Settings -> Battery
res/values/strings.xml