tree c0921bf397f2a1eb324c4caacb844c134e4fcc0c
parent 10d211b84a5f0790b28fcc8b3db66884d5f9c729
parent 2b6bf8dc0941f3a4531030b950cf24fd31248b0b
author Chih-Hung Hsieh <chh@google.com> 1424228039 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424228039 +0000

am 2b6bf8dc: Merge "Do not include genericStds_linux.cpp."

* commit '2b6bf8dc0941f3a4531030b950cf24fd31248b0b':
  Do not include genericStds_linux.cpp.