Merge changes Id25696e4,I939a12a2 into klp-dev

am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
This commit is contained in:
Paul Stewart
2016-07-20 00:17:49 +00:00
committed by android-build-merger

Diff Content Not Available