| commit | a2cfb78f7931102f6f6db152664c10accf92d3c6 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Jul 21 10:56:26 2015 -0700 |
| committer | Colin Cross <ccross@android.com> | Tue Jul 21 10:56:26 2015 -0700 |
| tree | 1f954e01d2522622644250cd736c78e07c9ad186 | |
| parent | e176b2be3098a84bbb7da28a5c66b6deb03253b1 [diff] | |
| parent | 896754566fd2318814c18da447aa0ea5ee807e6a [diff] |
resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp Change-Id: Ia99e16eb83902f008960007468dd4d9fba88319a