tree 69515365f6a35bf9af506ac0eb9e1d347bbc69dd
parent 624577499445d4b78e82c07774784693e5638b88
parent bb7439d8a1bf4773c7d7f56bcbcfd3140387b9ac
author Paul Stewart <pstew@google.com> 1468976073 +0000
committer android-build-merger <android-build-merger@google.com> 1468976073 +0000

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0