| commit | d97e21c0e158307381869ef062c46aaaf0094775 | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:27:15 2016 +0000 |
| committer | Ivan Podogov <ginkage@google.com> | Tue Dec 13 20:27:15 2016 +0000 |
| tree | 9bfef69a7e1e7263def7dbf448667eb706c3bb1b | |
| parent | 90a198a659e2c57f36d21cfc458e2ba29dafa249 [diff] |
Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp Test: Treehugger Change-Id: Idd62dc36b4257f31148b29dec19a2785043e3d11