tree 2ca991eb33479f68376429876453b1bca2e60bbb
parent 319fd422c02a8012930019560d1bd913188c86b0
parent e57b56c7b62f0691de5030a2dce0fdf1f15876d2
author Chih-hung Hsieh <chh@google.com> 1471623059 +0000
committer android-build-merger <android-build-merger@google.com> 1471623059 +0000

Merge "Fix clang compiled memset recursive call problem."
am: e57b56c7b6

Change-Id: I8eab89f8cd90f8fa24d3707aeb7b54a973d6f11e