| commit | 19227261b8e56fca8ae2cb8015b4970d16f4bc18 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Mon Sep 12 18:43:04 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Mon Sep 12 18:43:04 2016 -0700 |
| tree | 367fb6e2ab21049edf9cc6ebabcb46cad5507ccf | |
| parent | 6c26438b346731a0bc01fce6754b1177f671f676 [diff] | |
| parent | 99b39aa101bb0fe24b3a9a2f87786437c16942ea [diff] |
resolve merge conflicts of 99b39aa to nyc-mr1-dev-plus-aosp Change-Id: Ic05b48ec1ae8b1110c231d1bc28a0e05ff38ebc1