| commit | a21b2e30b246b152b3b3692384de534ade2f3485 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jul 31 09:02:32 2015 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Fri Jul 31 09:02:32 2015 -0700 |
| tree | a13af078fdf4dfc0373934ac69cf1e1b72a57655 | |
| parent | 9bc9469807703757f50fffd34ed6b3f6183cdc6e [diff] | |
| parent | d0694da4fb85bb01e7c0ea7989a78a0e635453ac [diff] |
resolved conflicts for merge of d0694da4 to mnc-dr-dev Change-Id: Ifd2636d0e1b7eae15d412cfa0a948a572c905b3a