From: Josh Gao <jmgao@google.com>
Date: Mon, 2 May 2016 18:53:31 +0000 (+0000)
Subject: Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac am: 583a4f8d35
X-Git-Tag: android-x86-8.1-r1~296^2~188^2~290
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e96d0485afbbf78e666e89db41e552f701568742;p=android-x86%2Fbionic.git

Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac am: 583a4f8d35
am: 0910c25811

* commit '0910c258110cdb36ab4dfb67f7c0c6f248100fb6':
  Remove nonexported _ns_flagdata from public header.
  Add platform specific version tags.
  Add __INTRODUCED_IN_FUTURE for unreleased APIs.
  Add versioning information to symbols.

Change-Id: Ia45ce4f55f24985ff6c1cc17d7ade2004611fa21
---

e96d0485afbbf78e666e89db41e552f701568742