tree 9bfef69a7e1e7263def7dbf448667eb706c3bb1b
parent 90a198a659e2c57f36d21cfc458e2ba29dafa249
author Ivan Podogov <ginkage@google.com> 1481660835 +0000
committer Ivan Podogov <ginkage@google.com> 1481660835 +0000

Really resolve merge conflicts of 903d641 to nyc-mr2-dev-plus-aosp

Test: Treehugger
Change-Id: Idd62dc36b4257f31148b29dec19a2785043e3d11