| commit | 0492686c4703b3ddbff52d047ef226b973a3388a | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Mar 02 15:42:53 2016 -0800 |
| committer | Eino-Ville Talvala <etalvala@google.com> | Wed Mar 02 15:42:53 2016 -0800 |
| tree | 59c4bfe277c79bf4cf3198d13472f49ca7000b98 | |
| parent | fb4a8ad9003ce26ba3c870818f53001d2eeeded4 [diff] | |
| parent | 6e0c00ba53d8e5ad14d9e447c3c040ce6fd81a47 [diff] |
resolve merge conflicts of 6e0c00ba53 to nyc-dev-plus-aosp Change-Id: I123a42e8cd1439177ea75a3c0aba7dca0b2f31fe