tree 97d2746c8b0255f1661a69ef517a23e35f2fbe7d
parent 3c32c3009e85551694adcf5165043426885d7197
parent 474a9af0b46e2bbc03ccddd2549d6fe479e62a96
author Chih-hung Hsieh <chh@google.com> 1471629908 +0000
committer android-build-merger <android-build-merger@google.com> 1471629908 +0000

Merge "Revert "Fix clang compiled memset recursive call problem.""
am: 474a9af0b4

Change-Id: Ieaab9a6c19f8759d4186ba1b35ea5fa51d9bfc60