OSDN Git Service

Merge "Fix some easy cases of __ANDROID__ versus __BIONIC__."
authorElliott Hughes <enh@google.com>
Sat, 17 Sep 2016 16:47:19 +0000 (16:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Sep 2016 16:47:19 +0000 (16:47 +0000)
am: 42743f1e9e

Change-Id: I15acfed16e1381673ae9d8338348d6ad925abba8


Trivial merge