tree 69823044a1283ea9eb58815ec3d54190bc76f613
parent 8771a2fe9f5892fa4646cf50ae728f54b427356f
parent 26b8c9d432adc2fc71438050377cb6106dffde1a
author Brian Carlstrom <bdc@google.com> 1332733806 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332733806 -0700

Merge "Fix sdk_x86 build" into dalvik-dev