tree ab356d25b69c9a87b9719a510770e2757174538e
parent 77a41a69201579792397ba33bc93f5f5a77da981
parent 5d79c5deba3fa27825a2d5a399713b9490f5ca28
author Brian Carlstrom <bdc@google.com> 1382330651 -0700
committer Brian Carlstrom <bdc@google.com> 1382330651 -0700

resolved conflicts for merge of 5d79c5de to dalvik-dev

Change-Id: I0afb78246053c5adf4b5ed4a062c9e0cfda8d398