| commit | 8dcda391c79e8c2fd20a87834f1f61645aa771ea | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Sat Aug 15 00:16:41 2015 -0400 |
| committer | Geoff Mendal <mendal@google.com> | Sat Aug 15 00:03:09 2015 -0700 |
| tree | d8627d43359f158bc82ea3aff9e02a7838a4ab41 | |
| parent | 479c482ca1788235afc776125eb6a79f1d9281c8 [diff] |
resolved conflicts for merge of 8ad3e817 to mnc-dr-dev Change-Id: Ic4ea07a337b8d831f281b0a4048d0b4132597aa7