summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/Task.java
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-09 16:19:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-09 16:19:47 +0000
commit1b1c021858daca0e77c106503798c2c47cb372b4 (patch)
tree7be4ea35415e3755e07cafad410ed14f049f99d0 /core/java/android/content/Task.java
parent10bdb4b9e966f0a3d8e1099bf8eff4c41c31981c (diff)
parent280fe930a432d9e2ead8c4b58ce76a0ee45742e7 (diff)
downloadframeworks_base-1b1c021858daca0e77c106503798c2c47cb372b4.zip
frameworks_base-1b1c021858daca0e77c106503798c2c47cb372b4.tar.gz
frameworks_base-1b1c021858daca0e77c106503798c2c47cb372b4.tar.bz2
am 280fe930: am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect"
* commit '280fe930a432d9e2ead8c4b58ce76a0ee45742e7': jni: liblog reading error API incorrect
Diffstat (limited to 'core/java/android/content/Task.java')
0 files changed, 0 insertions, 0 deletions