tree 49c227cd67ab151de356455f06e00044c49b4b87
parent 6b05e285ccf84acb94b426d7d5d85869a6936a0a
parent 2331eefef72c07f4f6dcf1f96eaa774034988ef4
author Paul Stewart <pstew@google.com> 1468978514 +0000
committer android-build-merger <android-build-merger@google.com> 1468978514 +0000

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165
am: 2331eefef7

Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b