tree 29f67bb620eff9da27d5d9804ac8398f67d9d72b
parent a123f73a1c331c953580675509323622729d6f6e
parent 5fe3eb76967316b96a04717df2e4e73ca7ae8060
author Andreas Gampe <agampe@google.com> 1488906523 +0000
committer android-build-merger <android-build-merger@google.com> 1488906523 +0000

Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b
am: 5fe3eb7696

Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd