OSDN Git Service

Merge "Adds stripTrailingFs" am: 27bb333e14 am: a91491a3b8
authorJun Yin <junyin@google.com>
Thu, 25 Jan 2018 03:42:45 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 03:42:45 +0000 (03:42 +0000)
am: 76e05493b4

Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732


Trivial merge