| commit | e38826d2c0aad568019cc8c24603eadb1fe7e607 | [log] [tgz] |
|---|---|---|
| author | Yang Ni <yangni@google.com> | Fri Jan 15 13:28:52 2016 -0800 |
| committer | Yang Ni <yangni@google.com> | Fri Jan 15 13:28:52 2016 -0800 |
| tree | abf4e2603262286841b5a233b7f549326e73b51c | |
| parent | 13f0489236e8cb3bd6691170b8090a67fed1b3d7 [diff] | |
| parent | 70171ef802733be0f2e11b6f5029515536e67e20 [diff] |
resolve merge conflicts of 70171ef802 to mnc-dr2-dev-plus-aosp. Change-Id: I49b3580d19015d76083b1ed98e468fd55b3c55d7