tree 23ccffeb52a3ec9791af0658360806c01495b2ca
parent d6e586204f10c9675009bfcf533860e39a3a4cbf
parent ce5868862a04a348967fb5bdad291b2b27b6e506
author Tao Bao <tbao@google.com> 1458254673 -0700
committer Tao Bao <tbao@google.com> 1458254770 -0700

resolve merge conflicts of ce58688 to nyc-dev-plus-aosp

Change-Id: Ia9bfb989b6d13ee4f6a22216beb94065a9487484