tree 48a5ceff01d266f82a3594d703a79806a6ce099e
parent 937ca850ecda287872e36c8a75b8c035d407d44d
parent 2f272c0551f984e83bc5abaf240e0dddb38a3326
author Yabin Cui <yabinc@google.com> 1467322619 -0700
committer Yabin Cui <yabinc@google.com> 1467324792 -0700

resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp

Change-Id: I889d94a723415ad2e660b8c99e66935142918bc4