tree bed023fc488ebbc48edfef32a6633bc0159328b2
parent 7b395e79e2818f814e827a56dba0609b852293a6
parent c25ff2531e148d44197b54eafbd3df9d03329bd6
author Yong Shi <yong.xa.shi@sonymobile.com> 1506103456 +0000
committer android-build-merger <android-build-merger@google.com> 1506103456 +0000

resolve merge conflicts of f52e218a0d to oc-dev am: cd7322b7c6 am: 5dc0f19073 am: 547b9e0836
am: c25ff2531e

Change-Id: Ie702bbff7566a76b161ece4f798768f55412eb88