tree d9d1d7c6ffd9ebca61d41cb012ded1f834d45e0f
parent 57e6d8a99058e5c74d5244b68a5f4d53526fa108
parent 0d82948094d9a198e01aa95f64012bdedd5b6fc9
author buzbee <buzbee@google.com> 1382382992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382382992 +0000

Merge "64-bit prep" into dalvik-dev