Merge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev

am: 3027f4720a  -s ours

Change-Id: Iff50bd84ac5d36e85bfb344c8bcc1697bca79a27
This commit is contained in:
Hugo Benichi
2017-08-29 23:09:02 +00:00
committed by android-build-merger

Diff Content Not Available