tree 491b260014a699b690ce32b1a9554b14eb3705ed
parent e0c8a9bb02d4518c0723ea56b02da51373ddb5e9
parent 5823dd46df9667c43e8fc3f5ff79987b7432da3f
author Tianjie Xu <xunchang@google.com> 1462211841 -0700
committer Tianjie Xu <xunchang@google.com> 1462212566 +0000

resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp

Change-Id: I4ec33904a6af38d81b422c7be6f40b828fbc7525