tree b4812cb5785b6508590090e0d134d08707c262f5
parent 9a776af9920c050c7bd7353f33e0e02df940cf92
parent bf0e762dbb38b3a69c8b0e30571777a0ca30eb7c
author Treehugger Robot <treehugger-gerrit@google.com> 1469844436 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1469844436 +0000

Merge changes I946cde38,I4b8e0ea1,I2e8141a8

* changes:
  Mark LIBC_O as being a future version.
  Mark LIBC_N as being introduced in android-24.
  Annotate the libc version map with NDK info.