diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-28 22:30:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 22:30:10 -0700 |
| commit | 16a90db8d740b95cd4bdeff631464f58c9ed3da6 (patch) | |
| tree | 42496c3ec4575270cbd0259678d9bed6cf5a3249 /core/java/android/os/ParcelableParcel.java | |
| parent | 7ca6c5c42644d1036ca505db96c4986e2da70c62 (diff) | |
| parent | 897d98a7530109bff8d73b3651d8884c76f54c42 (diff) | |
| download | frameworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.zip frameworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.tar.gz frameworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.tar.bz2 | |
am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Diffstat (limited to 'core/java/android/os/ParcelableParcel.java')
0 files changed, 0 insertions, 0 deletions