summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/Debug.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-28 22:27:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 22:27:44 -0700
commit897d98a7530109bff8d73b3651d8884c76f54c42 (patch)
tree0bfda31e3fb76a26398f98b2f0c9e23b9ec542fd /core/java/android/os/Debug.java
parenta1f49d8bb77db20617f9ea372ad9f1a9e06deece (diff)
parent6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354 (diff)
downloadframeworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.zip
frameworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.tar.gz
frameworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.tar.bz2
am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354': Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Diffstat (limited to 'core/java/android/os/Debug.java')
0 files changed, 0 insertions, 0 deletions