tree 7f90de91e3181136d0fe695923c4a186c8a38e7c
parent 3fd9d855dba9f0f660c9f8a9dbb61f37dae8dcb7
parent 7eac6659c731b0cf6615de8c84affe55e83d8c00
author Shinichiro Hamaji <hamaji@google.com> 1454394374 +0900
committer Shinichiro Hamaji <hamaji@google.com> 1454394436 +0900

Merge remote-tracking branch 'aosp/upstream'

For 7eac665 to fix b/26880753.

7eac665 [C++] Handle multiple implicit patterns properly
88150d4 [C++] Fix a minor typo
844ff75 [C++] Add a target which builds tsan-enabled kati

Bug: 26880753
Change-Id: I7999a6e8a28361c66e57301641bd13269bd23584