| commit | dba3e995e510f08f7b2e1dc1776e825fa1fa5d4b | [log] [tgz] |
|---|---|---|
| author | Alex Light <allight@google.com> | Wed Jun 29 11:58:22 2016 -0700 |
| committer | Alex Light <allight@google.com> | Wed Jun 29 12:12:39 2016 -0700 |
| tree | de6af404abca8a314afab0023141c785cf72d5fd | |
| parent | a5dac1a35ba2876451dfee769830dff7e587c692 [diff] | |
| parent | df9d1770d178a2ac6510a50f360dd85ede09f873 [diff] |
resolve merge conflicts of df9d177 to nyc-mr1-dev-plus-aosp Change-Id: Ib16c68978eac596587de54a811316e6bdb7fed87