tree 7b75c46004b807f9a00d6bd39a35f03add671a49
parent 0c8300bccd4d1dfdf6b746d8d89ac526733f0181
parent c70bdbc1eb32e81259dbb4a5c028efef354e9c54
author Jean-Baptiste Queru <jbq@google.com> 1282172703 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282172703 -0700

am c70bdbc1: manual merge - fix build

Merge commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54' into dalvik-dev

* commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54':
  Cherry picking changes from dalvik-dev