| commit | 966f7e248c12ecac8495aada22a2ec65909de454 | [log] [tgz] |
|---|---|---|
| author | Adam Momtaz <amomtaz@google.com> | Mon Dec 10 13:25:46 2012 -0800 |
| committer | Adam Momtaz <amomtaz@google.com> | Mon Dec 10 13:25:46 2012 -0800 |
| tree | c18f63b46b0e172e174644a99411f86c3850151b | |
| parent | 192e4646680fcd4a566337595f25578a252cd8e6 [diff] | |
| parent | 5f09dd264275f79881ff9032730bdcda1fa7b19f [diff] |
resolved conflicts for merge of 5f09dd26 to jb-mr1-dev-plus-aosp Change-Id: Ib8d340b2d12693bdfc83606850a195ace8f0a20d