| commit | d7be214ca469c593d8a59cf7404020f4ad1aaed9 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Mon Jul 13 22:50:34 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Mon Jul 13 22:58:29 2015 -0700 |
| tree | ee0698ad253b11a9204f2baca3e72882fdd7bdb8 | |
| parent | c5eadf8d889b7e8901d647502d22a0d0c108d1da [diff] | |
| parent | 8cee6587e0efb2d8e63f1505b057a1e328525017 [diff] |
resolved conflicts for merge of 8cee6587 to mnc-dr-dev Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3