| commit | 061a4de86d79d3ead3f297fa3fde4692446af5e4 | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Oct 11 13:05:34 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 11 13:05:36 2012 -0700 |
| tree | 3fadba51030f7784b112148b0710e10a58b9f780 | |
| parent | a2f7ca7db1f797d7897dc66840d1ec64d1b2a6a1 [diff] | |
| parent | cea520747f344204a78db9d3f7f1abe3f695f49f [diff] |
Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev