tree d90ca85abe843399e314b837332ca7db2cee2b57
parent e2154883341df9bac61c7784bc10d667f7ab00e9
parent e640a8284d6612a2d26d98f3bcc2b20011e81763
author Chih-hung Hsieh <chh@google.com> 1507099661 +0000
committer android-build-merger <android-build-merger@google.com> 1507099661 +0000

Merge "Revert work around clang-tidy segmentation fault." am: a47e513464
am: e640a8284d

Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d