OSDN Git Service

Merge changes I25dca710,I85fdf927,I667fe53e,I46bf95ac am: 583a4f8d35 am: 0910c25811
authorJosh Gao <jmgao@google.com>
Mon, 2 May 2016 18:58:02 +0000 (18:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 18:58:02 +0000 (18:58 +0000)
am: e96d0485af

* commit 'e96d0485afbbf78e666e89db41e552f701568742':
  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: I8c822bea398332b6929883280950ee3411b1c591


Trivial merge