| commit | 4c61d6fa7a5f8b2d80ce85598b504e9459935c6e | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jun 18 19:54:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 18 19:54:36 2014 +0000 |
| tree | 431bdcf0dac89552ec5306c876a971469c98265a | |
| parent | 3e5c62bcd37b78aa2af228a5e0b5725ccc297200 [diff] | |
| parent | 14dc0e016fbc003f360db8aad265fca0d6a7c476 [diff] |
am 14dc0e01: (-s ours) Merge "Dalvik is dead, long live Dalvik! DO NOT MERGE" * commit '14dc0e016fbc003f360db8aad265fca0d6a7c476': Dalvik is dead, long live Dalvik! DO NOT MERGE