| commit | 9369592e2d6b264f649ab1b688e73ad58214427a | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:12:28 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:12:28 2015 -0700 |
| tree | 65336b7aea776cdde82ee948cf9f3130b60aa3b4 | |
| parent | 351e1fdc0561177e838b976be2476761cbbfd62b [diff] | |
| parent | 3777e2c43a7b19996f9b4893e57f46198facc2d4 [diff] |
resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp Change-Id: Ia0c7f2e33e22b2419811f7e68da276e02e156d08