diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2014-09-23 17:26:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 17:26:47 +0000 |
commit | bca67fd7d0747a950e88525d216af41272b20763 (patch) | |
tree | 21dc0269e234a0a4ca3c912577b450f6cf46ca1f /core/java/android/accounts/OperationCanceledException.java | |
parent | bbf7e4af975493c9c213250a595c63331cb7a872 (diff) | |
parent | 9aaf54eeb6c1dd83090235a8df5476b2f2f6473e (diff) | |
download | frameworks_base-bca67fd7d0747a950e88525d216af41272b20763.zip frameworks_base-bca67fd7d0747a950e88525d216af41272b20763.tar.gz frameworks_base-bca67fd7d0747a950e88525d216af41272b20763.tar.bz2 |
am 9aaf54ee: am 71b19fc3: am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
Sanity-check paths of files to be restored
Diffstat (limited to 'core/java/android/accounts/OperationCanceledException.java')
0 files changed, 0 insertions, 0 deletions