| commit | a1919ec4b55a105a5f165d5839c0742d58bc7847 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Mon Jun 06 22:49:15 2016 -0700 |
| committer | Sami Tolvanen <samitolvanen@google.com> | Mon Jun 06 22:56:23 2016 -0700 |
| tree | 1f66cb71e2ccb05fea0b647089d66b728689e177 | |
| parent | 701627961161087f9edd42b51ae9d2b8ad06b54c [diff] | |
| parent | ca332ab47ca07ba16861f882d58018c7cb55d94f [diff] |
resolve merge conflicts of eacbb82 to nyc-dev-plus-aosp Change-Id: Ia3077f826c1d422932b62684ae0d53935abfe807