| commit | 07e590a574de4a103418a319ab38986cbefb8ac7 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Thu Dec 29 14:05:47 2016 -0800 |
| committer | Marie Janssen <jamuraa@google.com> | Thu Dec 29 14:05:47 2016 -0800 |
| tree | 1f1abceb3abcab47794717612b92935e2d351aa1 | |
| parent | e11c3f6657cb70a86c5b322b3c017f229e751f3b [diff] | |
| parent | c816141bceb61d8f5a4e6aa6067c61f97a02efba [diff] |
resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525