tree a296613e281e687f61de27e34e1851c205f9e7d8
parent 2b2468eef943f0be75d73862e433d0eb9beeff93
parent fc0dcfa2ea4325b1e2a5fc938b57f1b2a50d5f67
author Andy McFadden <fadden@android.com> 1274469750 -0700
committer Andy McFadden <fadden@android.com> 1274469750 -0700

resolved conflicts for merge of fc0dcfa2 to dalvik-dev

Change-Id: I54a5b9996252a22e8dd0214f4a4ccc8914f876ea