tree e72cd2aa8196e270cc43a63e7ed490872c61bfb4
parent 0d8d7e8c0b146dbe2a47c781cab093e00011bd00
parent 095164e1d1b91e6ce46df590d2f80b8cfd40ec11
author Elliott Hughes <enh@google.com> 1490764358 +0000
committer android-build-merger <android-build-merger@google.com> 1490764358 +0000

Merge "Make demangle work more like c++filt." am: 58c1804653 am: 939cb2950f
am: 095164e1d1

Change-Id: Ia0c2e1d35f48b6d2fa7b7414cf8ee928e7899a46