tree 003889f908064aa2343d90ae0370825fe4825375
parent 9b63de12e2ce4ee18359d9910ccc6dfb5be85d41
parent b4467ac98a8f0202746b6abb119e6b408f01864f
author Rubin Xu <rubinxu@google.com> 1491416189 +0000
committer android-build-merger <android-build-merger@google.com> 1491416189 +0000

Merge "Fix liblog#__security failure" into oc-dev am: 210be3820f
am: b4467ac98a

Change-Id: Ia9648388ba527d3314fe8d28a390726ca5de14ef