| commit | 013441f2965fecad98ad3b57251bee75c09aac99 | [log] [tgz] |
|---|---|---|
| author | Tony Mantler <nicoya@google.com> | Fri Aug 28 15:56:49 2015 -0700 |
| committer | Tony Mantler <nicoya@google.com> | Fri Aug 28 15:56:49 2015 -0700 |
| tree | 631992f6316a31ddbd9aadc48fa560194c5d1f67 | |
| parent | 0c5f4b63b9e0b0b0d4f1fd5c3d4b99757b8582a7 [diff] | |
| parent | fab9a1f2672ca4e1a47845d68cc787811c50338b [diff] |
resolved conflicts for merge of fab9a1f2 to mnc-dr-dev-plus-aosp Change-Id: I5cd69798c3880b835cdebf45dcaf90a8b26a1d4d