resolve merge conflicts of 0110b7d to nyc-mr1-dev-plus-aosp
authorPavel Zhamaitsiak <pavelz@google.com>
Mon, 2 May 2016 23:16:41 +0000 (16:16 -0700)
committerPavel Zhamaitsiak <pavelz@google.com>
Mon, 2 May 2016 23:16:41 +0000 (16:16 -0700)
commit658e0c501bd3c20a400915b1e0b99fc95533c904
treee525501e883f914f8c3963e83ecd5b9843af50a8
parent6a35afdc139fb97a49bc5eb60fb76e5989b46bd6
parent0110b7d9c4e20228931fa915a80f0373b1104762
resolve merge conflicts of 0110b7d to nyc-mr1-dev-plus-aosp

Change-Id: If476e2183c04353f4848833864909cc2f191ddf7