tree 5a665564e666ee76613baf5336f70affe635ee2e
parent 0146b37256d6a57a0f597bca1c5c04d93bade5c1
parent 2a4386fa7bd7275ecdb1ca218873a8aeb5bccaca
author Tao Bao <tbao@google.com> 1465870627 -0700
committer Tao Bao <tbao@google.com> 1465870627 -0700

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

Change-Id: I70eef6efaba6990fdae2b58b3bbca03407b6676e