| commit | 781c4b19f4c0dd57274470f1dbdce16f4828220c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Mar 04 19:10:07 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 19:10:07 2013 +0000 |
| tree | 2039887706f0d9ae6db5f211649c694cefd2b0c3 | |
| parent | 0a1ab287ff33f660e8098b953b76032dcfb68c0c [diff] | |
| parent | 98650e04e6d87e0b2c82151eacbe483ac15949d9 [diff] |
am 98650e04: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '98650e04e6d87e0b2c82151eacbe483ac15949d9': Avoid changing the C++ ABI with ssize_t.