tree bda6af87856cd11f827081a79795afe8c0d9dac7
parent 84545eeaf5734fcb7e3867f6aea20c730b38c4a7
parent 253b12905cd4253837aa8e769df93201697adf14
author Hall Liu <hallliu@google.com> 1476141101 -0700
committer Hall Liu <hallliu@google.com> 1476144810 -0700

resolve merge conflicts of 253b129 to nyc-mr1-dev-plus-aosp

Change-Id: I9d37a418982377eb1b94596998e22467d6c86402