| commit | 9944ae8890451f6669dcfe4faace64f3f498fc84 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Jun 19 02:52:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 19 02:52:33 2014 +0000 |
| tree | 701b99b1e17a1087b5300648dc5a951dc40c5584 | |
| parent | 037b9bcbd89a5cbbf90e1f2bd55ed5da88aa46e1 [diff] | |
| parent | f6bb79b2b7f6aa6a81db0756fe88acd7ff5fedd7 [diff] |
am f6bb79b2: (-s ours) Merge "Dalvik is dead, long live Dalvik! DO NOT MERGE" * commit 'f6bb79b2b7f6aa6a81db0756fe88acd7ff5fedd7': Dalvik is dead, long live Dalvik! DO NOT MERGE