tree f65b0d13a054395dd09201dcff46c5bd655bd997
parent 9accc96dd12c673d64521c2e8dfbdf4916e5174e
parent 90d3f20c993671ec7fa90119ce5d214cc370f83d
author Tao Bao <tbao@google.com> 1489847606 -0700
committer Tao Bao <tbao@google.com> 1489847606 -0700

resolve merge conflicts of 90d3f20c to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c1806eceb56712c4b3d1c67d54f4b21bd3fe50a