tree 4894ba778a43e4e9e48a841a5c4ef834808ce437
parent 2fdc9c84f6c3000b51aab8ffa201574a02349681
parent 772153b3c7fad7a1147290843d3d45f672ffa825
author Tao Bao <tbao@google.com> 1475008703 +0000
committer android-build-merger <android-build-merger@google.com> 1475008703 +0000

resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp
am: 772153b3c7

Change-Id: I1fcc0375b08dc776a9cc3f122b071d34241e29c8