tree 97c0d3b041620e61056f26d91cd1ccee64818ef5
parent 763330669f7e420d01f544fbd91e1fb0a9399b9d
parent 51e5386d207785316431be6719b3f128bc4048c0
author Elliott Hughes <enh@google.com> 1336005407 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336005407 -0700

Merge "Port 311886c6c6fcd3b531531f592d56caab5e2a259c to art." into dalvik-dev