OSDN Git Service

Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6
authorElliott Hughes <enh@google.com>
Wed, 18 May 2016 15:34:44 +0000 (15:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 May 2016 15:34:44 +0000 (15:34 +0000)
am: 1189f6f678

* commit '1189f6f6788a5cb97f13c5ae7166dc802343c440':
  __ARM_ARCH__ is always >= 6.

Change-Id: I6bb088ce56819a17b4ffa3c7925ac8ccc229368b


Trivial merge