tree 2ca991eb33479f68376429876453b1bca2e60bbb
parent caad6c126ff53eb9c0fd077f6a80e8456a7181fd
parent 3c32c3009e85551694adcf5165043426885d7197
author Chih-hung Hsieh <chh@google.com> 1471623266 +0000
committer android-build-merger <android-build-merger@google.com> 1471623266 +0000

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

Change-Id: Ie0f960d696aa631da16e5c17a6c740f4580a16b9