tree 21d2dad05c73ebf4d8ea2a2896f0f88ef38764e1
parent 108b8ec82a5085d5abbe85143f0d0bf1e535ec83
parent 76c71a01e2c39a35969b19811afdf78e3e60124b
author Dianne Hackborn <hackbod@google.com> 1492185718 +0000
committer android-build-merger <android-build-merger@google.com> 1492185718 +0000

Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am: 29c70437b3
am: 76c71a01e2

Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7