tree e5613cb387bfa89eaa269df943fea0e09309bcd1
parent f8d4c187a31d09f17881e77e09e68d4ec389f791
parent 0f9a968c0e8fcdf45ff20f7d60695cd77e952f8d
author Paul Stewart <pstew@google.com> 1468977135 +0000
committer android-build-merger <android-build-merger@google.com> 1468977135 +0000

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

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454