summaryrefslogtreecommitdiffstats
path: root/core/java/android/os/CancellationSignal.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-16 18:11:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-16 18:11:47 +0000
commit872d191e6134b429f833013b8706c7b54ebd0d2a (patch)
tree7cd8aa63663d55f4ae10d76a1f7002f525e27bcf /core/java/android/os/CancellationSignal.java
parentb60a658edbfae486a4b9975da3f701ff5a2d31be (diff)
parent8af305f17ff0d4b84e5a71777de788e9a6ae2780 (diff)
downloadframeworks_base-872d191e6134b429f833013b8706c7b54ebd0d2a.zip
frameworks_base-872d191e6134b429f833013b8706c7b54ebd0d2a.tar.gz
frameworks_base-872d191e6134b429f833013b8706c7b54ebd0d2a.tar.bz2
am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780': Revert "Frameworks/base: Fix a constructor"
Diffstat (limited to 'core/java/android/os/CancellationSignal.java')
0 files changed, 0 insertions, 0 deletions