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

am: 1b1b84e96a  -s ours

Change-Id: I80b512c0e92d5be5a62ae55f62f300c0cadb41fd
This commit is contained in:
Hyunyoung Song authored and android-build-merger committed 2016-11-24 02:00:49 +00:00
commit 57d4540382

Diff Content Not Available