tree 8a8d08663e131a26916b9f77e92330a408d17bdc
parent b2d552259ebe254fe3fc830e71caadef9d72a778
author Chris Wren <cwren@android.com> 1349917376 -0400
committer Chris Wren <cwren@android.com> 1349917571 -0400

resolve conflicting assumptions from the merge.

Bug: 7300843
Change-Id: I5894fba34550d1b98f6cbe5ca808820b70e19819