tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent 55fac8f48dccd580840a6abd2ade76a1e9bd8164
parent 1b1b84e96a30b30d1df11948eccdf3bb0a821233
author Hyunyoung Song <hyunyoungs@google.com> 1479952849 +0000
committer android-build-merger <android-build-merger@google.com> 1479952849 +0000

resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp
am: 1b1b84e96a  -s ours

Change-Id: I80b512c0e92d5be5a62ae55f62f300c0cadb41fd