OSDN Git Service

am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings...
authorBrian Carlstrom <bdc@google.com>
Tue, 16 Jun 2015 23:18:33 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Jun 2015 23:18:33 +0000 (23:18 +0000)
commit99c1009a897834e8282a59c0dda8f29dd33234e4
treec1e9f61415cbd7c2a468a397ccc50505808d37ee
parentaa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa
parent49d73c03aa5b8b21c5e8a926b6a894245ffdf906
am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
  dex2oat should show something friendlier in Settings -> Battery