| commit | 0034beab72d6574de5009e5947729a2bfd17d66e | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Nov 14 19:10:18 2012 -0800 |
| committer | Scott Main <smain@google.com> | Wed Nov 14 19:10:18 2012 -0800 |
| tree | 10b75b4b69e0f1eaa89934f53784cd05f4ac5f37 | |
| parent | e3be79be3f81f1af67f4f6704ae452512065bce6 [diff] | |
| parent | 783e115b6008eb3425d1b3f82aff9fd5249b47aa [diff] |
resolved conflicts for merge of 783e115b to jb-mr1-dev Change-Id: Ibfd3023a845fb6cc549f05bcff2d6e4abc7e5a07