| commit | b3f90b84ab2cd956e19913889f662d5676943503 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Jun 18 21:40:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 18 21:40:23 2014 +0000 |
| tree | d12bca0585f1c0ae90e6f4c5ca4c33821c76b323 | |
| parent | c35978482146683fea79f081c22b223f9b561ddc [diff] | |
| parent | 4c61d6fa7a5f8b2d80ce85598b504e9459935c6e [diff] |
am 4c61d6fa: (-s ours) am 14dc0e01: (-s ours) Merge "Dalvik is dead, long live Dalvik! DO NOT MERGE" * commit '4c61d6fa7a5f8b2d80ce85598b504e9459935c6e': Dalvik is dead, long live Dalvik! DO NOT MERGE