| commit | cea520747f344204a78db9d3f7f1abe3f695f49f | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Wed Oct 10 21:02:56 2012 -0400 |
| committer | Chris Wren <cwren@android.com> | Wed Oct 10 21:06:11 2012 -0400 |
| tree | 8a8d08663e131a26916b9f77e92330a408d17bdc | |
| parent | b2d552259ebe254fe3fc830e71caadef9d72a778 [diff] |
resolve conflicting assumptions from the merge. Bug: 7300843 Change-Id: I5894fba34550d1b98f6cbe5ca808820b70e19819