| commit | 53769eb17540bef18fe96f6f06e93f28b082041c | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Fri Dec 18 11:27:33 2015 -0800 |
| committer | Tim Murray <timmurray@google.com> | Fri Dec 18 11:27:33 2015 -0800 |
| tree | 4f44ec1d1e598c7914ab3411a4f1c883df1c435c | |
| parent | e664e047fd3bec7867ba6e15fbbbe4aa7f0800b9 [diff] | |
| parent | 22e7148b2cf78943b052ecb43096d1a38ff88c5a [diff] |
resolve merge conflicts of e9cf477488 to mnc-dr2-dev-plus-aosp. Change-Id: I162578bdbb831c0442df03cee142dbc9df657799