tree 9d7c3c1f8f5674a543e2a4d11f49f7662874e5fb
parent b44cae3df535edc9e661fad1943278e7dbc5b979
parent c10b73bdb59a403e4335f94d13a2b3a61a9c65ee
author Vladimir Marko <vmarko@google.com> 1528137613 -0700
committer android-build-merger <android-build-merger@google.com> 1528137613 -0700

Merge "Refactor String resolution." am: 37ee471e82
am: c10b73bdb5

Change-Id: Ib35cd1b8f5b862eb706a9a9552ffdaf7e3fd2569