OSDN Git Service

Merge \\\"Don\\\'t use sp<>&\\\" into klp-dev am: 598f8d3218 am: 0ee3710873
authorMarco Nelissen <marcone@google.com>
Thu, 9 Jun 2016 00:06:26 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 00:06:26 +0000 (00:06 +0000)
commit33e914c861732cbcca923d34d368e1635b68434f
treefc74b24569a4ccec9808f7a797df98c5d8980749
parent20062e9ea6f406bb2e4f5bbbee0845f8fd81eab4
parente66381758d6ba02494251e6097e0774a56524be5
Merge \\\"Don\\\'t use sp<>&\\\" into klp-dev am: 598f8d3218 am: 0ee3710873
am: e66381758d  -s ours

Change-Id: Ie7422768422714cd1c88d2c9c52d7d682157bb4a