tree 2ca991eb33479f68376429876453b1bca2e60bbb
parent efda95c691aca3450a9d3d11675025ab80c5a69d
parent a6588b4831a412285b87424be12332a181c0dbd0
author Chih-hung Hsieh <chh@google.com> 1471623447 +0000
committer android-build-merger <android-build-merger@google.com> 1471623447 +0000

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

Change-Id: Ib99df518f130828cc9d3402156834dd630814bb8