tree a2d29f5c18dc073548b0869653fdc825ff9baa02
parent da412f11479122b898a842328fe0a45998f9cfb5
parent 8e0899faabf1bb0ff2bd519e316bb26ae0011e89
author Paul Stewart <pstew@google.com> 1465338017 +0000
committer android-build-merger <android-build-merger@google.com> 1465338017 +0000

Deal correctly with short strings am: 1921acbf2c am: 49fefde164 am: 444e06c469 am: 0f37e416a4 am: 04fdb2ce41 am: 05e029710c
am: 8e0899faab

Change-Id: I0be9d821272c24f8d9d89771a49c678f10e73bbc