tree 65682a9dd8911cf4f2d420356ca9229065bd45d3
parent 999c3ea23b8369cd710524055cca4ec282a332c6
parent 33e914c861732cbcca923d34d368e1635b68434f
author Marco Nelissen <marcone@google.com> 1465430948 +0000
committer android-build-merger <android-build-merger@google.com> 1465430948 +0000

Merge \\\\"Don\\\\'t use sp<>&\\\\" into klp-dev am: 598f8d3218 am: 0ee3710873 am: e66381758d  -s ours
am: 33e914c861

Change-Id: If26c7cf5ce09bc4d92033dbc1ad3b400854a22b3