tree bfa2cdc6a437e8d3e34d2c5f6659a113ad95661c
parent 3495d111cc7a7eb076c748f97940c8a15fc4781d
parent 756e14e4715aa2be0b3719c0bcadfcf31e7531d9
author Chih-Hung Hsieh <chh@google.com> 1507910982 +0000
committer android-build-merger <android-build-merger@google.com> 1507910982 +0000

resolve merge conflicts of 74770629 to stage-aosp-master am: c14edd65d9
am: 756e14e471  -s ours

Change-Id: I6588c69786e7113d1e437d4d69179429897c4c98