OSDN Git Service

Merge "Update strings when shortString is true" into oc-mr1-dev am: d0066e3875
authorjackqdyulei <jackqdyulei@google.com>
Wed, 23 Aug 2017 20:15:19 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Aug 2017 20:15:19 +0000 (20:15 +0000)
am: 02e4c7d809

Change-Id: I031e65952befe7507ce09701af02e1131fe278cf


Trivial merge