| commit | 4b9c2c454ddc6b492a261266f21011dd4ba07feb | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Aug 24 09:24:53 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Aug 24 09:24:53 2015 -0700 |
| tree | cc39ee0e7198427ca9b2d81909dc807b6eb00a99 | |
| parent | cdec7c543850c85bc84952b3b11d7c3b35f16606 [diff] | |
| parent | 8b27c273110288a2af9d95c035731f02e46e564c [diff] |
resolved conflicts for merge of 77e27d8c to mnc-dr-dev-plus-aosp Change-Id: I2bc0a34356602f51a9eee5616194d05544a4a732