tree bcba14234c7abb5130afdbf104677de7e9277004
parent 2b83f36355ed197cddc73046dad22ce6d953ae32
parent f3db68dd612daa0950f54add874771e7c469b9e2
author Tao Bao <tbao@google.com> 1489852555 +0000
committer android-build-merger <android-build-merger@google.com> 1489852555 +0000

resolve merge conflicts of 90d3f20c to stage-aosp-master am: 553c7bd307
am: f3db68dd61  -s ours

Change-Id: I98c0681152bd8dcb7f04b281acbbb7ffb9a39f51