tree 79f776156e3a9af10bbea1a776ff820392987b6e
parent e7b169767ce382df8d6dc6396b78a7d401a41bf9
author sqian <shuoq@google.com> 1510689248 -0800
committer Shuo Qian <shuoq@google.com> 1510698476 +0000

Fix Merge conflict CL

- add a hash that is added in the oc-dev

Test: Treehugger
Bug: 65230472
Change-Id: Ifa99cde4aa30e53567ee744151f483de4e0739c9