| commit | 0467529c85a69fadc7b7127485a1a0c0c83db7b4 | [log] [tgz] |
|---|---|---|
| author | Michal Karpinski <mkarpinski@google.com> | Fri Dec 02 11:43:02 2016 +0000 |
| committer | Michal Karpinski <mkarpinski@google.com> | Fri Dec 02 11:43:02 2016 +0000 |
| tree | 1d4a917310e8f05783113e34f8018f7b111d0877 | |
| parent | 133de5dce0a14ccc8cd62acbb4382eecabdb85d8 [diff] | |
| parent | 7f9014bb9d155cce28f6da375675a4338c60590e [diff] |
resolve merge conflicts of 7f9014b to nyc-mr2-dev-plus-aosp Change-Id: I9c08147c7a39f3121b5d817c2f498c9ad93066f3