tree a35e0ff67f96800d73c3973bbaeb72ae7883fd16
parent 4d55cfd185778f5ad1155406c634191415ddcb16
parent 4b42e5d663c3339b257036aeb81eb13b41b0bd17
author Brian Carlstrom <bdc@google.com> 1288823384 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288823384 -0700

am 4b42e5d6: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-master

* commit '4b42e5d663c3339b257036aeb81eb13b41b0bd17':