| commit | 4042ee159cc3cfba362c5f99b13127135d2c893a | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Jun 19 02:57:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 19 02:57:23 2014 +0000 |
| tree | 7b8efa81afc05bd53e0cd106d4bbb2a491162744 | |
| parent | 5ed55092cd487cbb2b9fbc6bab4561c695854f19 [diff] | |
| parent | 9944ae8890451f6669dcfe4faace64f3f498fc84 [diff] |
am 9944ae88: (-s ours) am f6bb79b2: (-s ours) Merge "Dalvik is dead, long live Dalvik! DO NOT MERGE" * commit '9944ae8890451f6669dcfe4faace64f3f498fc84': Dalvik is dead, long live Dalvik! DO NOT MERGE