| commit | 90a198a659e2c57f36d21cfc458e2ba29dafa249 | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:15:37 2016 +0000 |
| committer | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:15:44 2016 +0000 |
| tree | 35bea8f8d033647b7deddcc18a63dbae61bd37ce | |
| parent | 0ca78d3f85307635b3d7e4866efccea94edbefd3 [diff] | |
| parent | 903d6414e51ace98fa67fb5bf6f103ff9e4303d5 [diff] |
resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp Test: Treehugger Change-Id: Ie994c37011f6f4255ca681e4f0c0a99fa5c337fd