summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts/OperationCanceledException.java
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2014-09-23 17:26:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-23 17:26:42 +0000
commitbbf7e4af975493c9c213250a595c63331cb7a872 (patch)
treed5763e770360a1d50fee78f8bc3b402d5763d496 /core/java/android/accounts/OperationCanceledException.java
parent44737ea5e5a2f071ffc268f21556aa651a7637db (diff)
parent1cf337a222bbb0e26445e7904ece687af93aac48 (diff)
downloadframeworks_base-bbf7e4af975493c9c213250a595c63331cb7a872.zip
frameworks_base-bbf7e4af975493c9c213250a595c63331cb7a872.tar.gz
frameworks_base-bbf7e4af975493c9c213250a595c63331cb7a872.tar.bz2
am 1cf337a2: am 52824dab: am 1b4f1a79: am 1c2eaa78: am 660af7eb: am 59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '1cf337a222bbb0e26445e7904ece687af93aac48': Change permission guard on bindBackupAgent()
Diffstat (limited to 'core/java/android/accounts/OperationCanceledException.java')
0 files changed, 0 insertions, 0 deletions