| commit | 49d73c03aa5b8b21c5e8a926b6a894245ffdf906 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Jun 16 23:07:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 16 23:07:52 2015 +0000 |
| tree | 28aedfa159ecea07fd1a46e82b2fea492786f384 | |
| parent | 5fafa130ec8f031310e5372a89034057053fa634 [diff] | |
| parent | 94f4cb4e4660db823d268d14eb1199dbc11f8e86 [diff] |
am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev * commit '94f4cb4e4660db823d268d14eb1199dbc11f8e86': dex2oat should show something friendlier in Settings -> Battery