OSDN Git Service

Merge "Fix Soong x86 atom builds"
authorDan Willemsen <dwillemsen@google.com>
Wed, 13 Jan 2016 20:36:58 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Jan 2016 20:36:58 +0000 (20:36 +0000)
am: 5d10e69bea

* commit '5d10e69bea2381317c70861cf9984275906c81b4':
  Fix Soong x86 atom builds


Trivial merge