tree c1303a30a275ebd40f3731b3f0b4ae8cdbdcf226
parent 4c19b6f94342797b3bfda477b562a549c2d1006d
parent bf8e7f5462cbb1d11e9700a43e3d4f08b4328bd6
author Chenbo Feng <fengc@google.com> 1500403513 +0000
committer android-build-merger <android-build-merger@google.com> 1500403513 +0000

Resolve merge conflicts of 2ce31b513f to nyc-dev am: 974322c7bb am: 23d5a06ba9 am: 0c669d43f3
am: bf8e7f5462

Change-Id: Ie593bc27788d01b795dc8424da4088873bb1ba57