tree dc6ff3b451c8859c5d9d95f69e92baa5f7a415ad
parent ae1d9692e18dadcc5c304538ef3160334ec4c04d
parent 5105505efd35c6b2d934794b550538e4f18cf70d
author Chih-hung Hsieh <chh@google.com> 1507100215 +0000
committer android-build-merger <android-build-merger@google.com> 1507100215 +0000

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

Change-Id: I9c8bbe4322542d02dc43253b23ff7b0932488142