| commit | 58251fe44d120b284bcdc47c3f28fbdfa6fb524d | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Tue Aug 11 15:41:19 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Tue Aug 11 15:41:19 2015 -0700 |
| tree | 13997d40d7f72b9e0fe51c52f2a58e35b9be8f06 | |
| parent | 8ecce002390172310a3e9d7ab3e92f647c23b1fb [diff] | |
| parent | 87eb4007e16f67d156f646982764d5edaa16e0cb [diff] |
resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa