| commit | d36022901e39c49c976f863d1cad696514c6f193 | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Fri Apr 18 01:13:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 18 01:13:29 2014 +0000 |
| tree | 81fa3411c5fd9c575ad35d5a075238a5da5e2c95 | |
| parent | f4399e7243c35bef3eabfd20582246818a0bbbd3 [diff] | |
| parent | 7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc [diff] |
am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp * commit '7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc': jni: binder ptrdiff_t compile issues