tree a3afdd888cb91cb4587e1230e0a8638bdb1a912f
parent e284cd58c8724815cee73de65b1ddcc60cec6249
parent 715d8a203a2e7c163bda248ffc4a547c97964b33
author Yabin Cui <yabinc@google.com> 1454714872 -0800
committer Yabin Cui <yabinc@google.com> 1454714872 -0800

resolve merge conflicts of 715d8a203a to master.

Change-Id: Ic868ee9b27ef7251aa49ac814de7355ecd9c7d37