tree 334e38716948cfdf1b7694de0f34c0fa8a672966
parent c5cec281654c5dee2273ce4bebd3a749c3a1119e
parent c1c11d20de14476271c81b2d0f15ad2bf6e4b7a6
author Mark Salyzyn <salyzyn@google.com> 1455040069 -0800
committer Mark Salyzyn <salyzyn@google.com> 1455040069 -0800

resolve merge conflicts of c1c11d20de to nyc-dev-plus-aosp.

Change-Id: Ia9520e7ac0d13b440ab5a83991585c03eccf00a0