OSDN Git Service

am a0dea8be: am 2bdc7087: am 091314b7: Use cancellationSignal only on API Level 16...
authorGeorge Mount <mount@google.com>
Fri, 15 Mar 2013 15:46:56 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Mar 2013 15:46:56 +0000 (15:46 +0000)
* commit 'a0dea8be17e1a8f5d0b9436ec7dcbb0fdfa36a34':
  Use cancellationSignal only on API Level 16 and above.


Trivial merge