| commit | 191ad312d8aa6e3c05195b0f8a2182497f986b44 | [log] [tgz] |
|---|---|---|
| author | Grigory Dzhavadyan <grigoryj@google.com> | Tue Feb 23 17:51:14 2016 -0800 |
| committer | Grigory Dzhavadyan <grigoryj@google.com> | Tue Feb 23 17:51:14 2016 -0800 |
| tree | d2df09fa813149e549245a9380dd84b3b1495534 | |
| parent | d171cf1197213df497a047c52cce31ecd45dae69 [diff] | |
| parent | 0d092ccad9fa3b39057dc1329888a9411c9d48f6 [diff] |
resolve merge conflicts of 0d092ccad9 to marshmallow-cts-dev Change-Id: Ib6d9724701bab0fae54550ff506fe9f9ff5bceb2