| commit | 8ac76de45adf4a6cbf2d88cce0d079d211f2cb15 | [log] [tgz] |
|---|---|---|
| author | Will Leshner <wleshner@google.com> | Fri Jul 25 19:18:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 19:18:17 2014 +0000 |
| tree | 3c9f3509878323d3431567bea822ca2a1858cef3 | |
| parent | 79f6fcc17c9df7ee6f98e872b70a4bb647c05aef [diff] | |
| parent | d305c3ad8ead4e24cee0591dd64f46355e69adfc [diff] |
am d305c3ad: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp * commit 'd305c3ad8ead4e24cee0591dd64f46355e69adfc':