| commit | b70d0551100794ca2687bec0115571f9fab52fe4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 13 10:48:32 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Aug 13 10:48:32 2013 -0700 |
| tree | 5cad48617f5b0b37b22fcff3e40b5044f889dca6 | |
| parent | fdf82f8ba94915a263b418350c3b55ab42002841 [diff] | |
| parent | 465008a40dee670be5fec7fc4de77eba93fa0aef [diff] |
resolved conflicts for merge of 465008a4 to jb-mr2-dev-plus-aosp Change-Id: Ic74f1a90347998122c69b312cb591ecbf09323de