| commit | d305c3ad8ead4e24cee0591dd64f46355e69adfc | [log] [tgz] |
|---|---|---|
| author | Will Leshner <wleshner@google.com> | Fri Jul 25 19:12:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 19:12:13 2014 +0000 |
| tree | 3c9f3509878323d3431567bea822ca2a1858cef3 | |
| parent | 0545d972cf95bdc58141a585016ca782d1a2274d [diff] | |
| parent | b98e0d8a3ada42f0eb0cc6749f7edff1431bad1a [diff] |
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp