tree 50c9bcb04b285819a557b1fb2d311173763c66ea
parent 2f5539a4eb682e0ad9b44641f5d98af0d97fed9a
parent 0b4823b9d6575070d8e8ff1f5e3a1fc6ef900551
author Andrew Hsieh <andrewhsieh@google.com> 1413426221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413426221 +0000

am 0b4823b9: am 4e47988f: Merge "Remove macros putc*/getc* from API<21 stdio.h to use"

* commit '0b4823b9d6575070d8e8ff1f5e3a1fc6ef900551':
  Remove macros putc*/getc* from API<21 stdio.h to use