am 98650e04: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '98650e04e6d87e0b2c82151eacbe483ac15949d9':
  Avoid changing the C++ ABI with ssize_t.
This commit is contained in:
The Android Open Source Project 2013-03-04 19:10:07 +00:00 committed by Android Git Automerger
commit 781c4b19f4

Diff Content Not Available