tree 657ffc0b3537ad30ef805bca977f1f3b61b1a61b
parent 1ac10cf8665149f9d21c0f65d55c20d37b831643
parent 234e7aa2441ef45dfd58245114efb2aae4ee1206
author Jayant Chowdhary <jchowdhary@google.com> 1516828596 +0000
committer android-build-merger <android-build-merger@google.com> 1516828596 +0000

Merge "Additional fix for coversion from type-id to type-string." am: 628484644a
am: 234e7aa244

Change-Id: Ib27503cee1406495023925f5a80771190bb967aa