tree e72cd2aa8196e270cc43a63e7ed490872c61bfb4
parent 5a1e1e67a096a081ba27eecb87b09fbd87311806
parent b17a20b12797c009e9dee48a0568534bddf4fbd5
author Elliott Hughes <enh@google.com> 1490764508 +0000
committer android-build-merger <android-build-merger@google.com> 1490764508 +0000

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

Change-Id: I9c1f473eeb82f2dd2a93ac119f77bcbfaeba0c29