summaryrefslogtreecommitdiffstats
path: root/packages/BackupRestoreConfirmation
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2014-11-06 15:25:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-06 15:25:55 +0000
commit1985f4963a54dd3f0ba9379b9df44459b71b4cb5 (patch)
tree3d993e557b8fa7b7b3f0a47f9a5b27fc4415748a /packages/BackupRestoreConfirmation
parent4034241d9995a4c950abc0abcec8682f740557c5 (diff)
parentaa1185dc44347d1af713ec78b4a294683758b806 (diff)
downloadframeworks_base-1985f4963a54dd3f0ba9379b9df44459b71b4cb5.zip
frameworks_base-1985f4963a54dd3f0ba9379b9df44459b71b4cb5.tar.gz
frameworks_base-1985f4963a54dd3f0ba9379b9df44459b71b4cb5.tar.bz2
am aa1185dc: am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1
* commit 'aa1185dc44347d1af713ec78b4a294683758b806': Add a cross-profile intent filter only if it wasn't previously added.
Diffstat (limited to 'packages/BackupRestoreConfirmation')
0 files changed, 0 insertions, 0 deletions