tree b697e3f2a5014db12aa4c87c2439965f4a187567
parent 45fcc6c4897d87dd709cf7238941cac58781be19
parent 900d63ec75319c012d2b6b6e008afcc4b712d69e
author Ta-wei Yen <twyen@google.com> 1476240604 +0000
committer android-build-merger <android-build-merger@google.com> 1476240604 +0000

resolve merge conflicts of b00a3e7 to nyc-dr1-dev am: acc453be16
am: 900d63ec75

Change-Id: I86c47853501d3cae8cdea04b018b8a8f55b524e9