OSDN Git Service

DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command. am...
authorAlistair Strachan <alistair.strachan@imgtec.com>
Mon, 22 Aug 2016 21:00:29 +0000 (21:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 21:00:29 +0000 (21:00 +0000)
am: 9aacce7aed  -s ours

Change-Id: I75dd3ef8ca66716313d50d066d3a25b0222ffe8f


Trivial merge