| commit | 033688325b49778af4f3ca20cad1309703345be0 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Tue Jul 14 11:25:13 2015 -0700 |
| committer | Santos Cordon <santoscordon@google.com> | Tue Jul 14 11:25:13 2015 -0700 |
| tree | 8d0072640d4ea9b11123bc65ff265f6345996181 | |
| parent | b88c6afee98a7070112e63d16f1b2a3f9f0bf579 [diff] | |
| parent | ec185f4fe3f2222444366ee2005b6c2bd90f0880 [diff] |
resolved conflicts for merge of ec185f4f to mnc-dr-dev Change-Id: I45e6a0f3e57a84cb50ed22549c57ddc0ce05e845