tree ce133fda053a45fa0971d0990d85b9afe10c293b
parent 529970a1d61dca77e25057335a2e7bb8c3dc9c11
parent f82aba03a71d60e13557f8a5eb8e2fa4f6d627a2
author Hyunyoung Song <hyunyoungs@google.com> 1461196996 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1461196996 -0700

resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp

Change-Id: I9fdb4b870c11cd9ef1d46727496839743217fac3