tree 55bfbfe3d04f0d581cff73ad669685efb30bdf43
parent d5a72fae4ac66ab99d973af6cdd459dcde382573
parent bba87840d3a529ff20cca0d3b1ba60ae20af9ab3
author Pirama Arumuga Nainar <pirama@google.com> 1468971680 +0000
committer android-build-merger <android-build-merger@google.com> 1468971680 +0000

Merge \"Disable warning triggered in Clang r271374\"
am: bba87840d3

Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338