tree 77358089dfb749df53da2a509fce6b9f6dc778b1
parent c7c647bbf079259f73f8f5e899edce93ada397cc
parent 6ec78a64583d74085a046a9bc8b265d230b4a520
author Daniel Yu <dsyu@google.com> 1467131304 +0000
committer android-build-merger <android-build-merger@google.com> 1467131304 +0000

Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev
am: 6ec78a6458

Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a