tree 7fee60cf62ec02fab20f70f111b5925be8a772fa
parent cb135ad769a5368f6ceb8caf25105a95580cbd6a
parent 613eae4a6f75282c0737a84850418afcab54d4e8
author Mathieu Chartier <mathieuc@google.com> 1379452701 -0700
committer Mathieu Chartier <mathieuc@google.com> 1379452701 -0700

resolved conflicts for merge of 613eae4a to dalvik-dev

Change-Id: I61734cbf585decf9a50ba23f008b341d025339ff