summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-01-27 10:44:21 -0600
committerJeff Hamilton <jham@android.com>2011-01-27 10:44:21 -0600
commit992f75bcd0ca37147df832c0cfc41995422df6db (patch)
tree7e2aaaaae7d5e96d47eb458b3ff0e71cdfdf3ede /keystore
parent56d39d1e03cfdecba66afcfe0a26848350d3b8b9 (diff)
parent6687ecb447025a1c56253d0fd67ad30af070db17 (diff)
downloadframeworks_base-992f75bcd0ca37147df832c0cfc41995422df6db.zip
frameworks_base-992f75bcd0ca37147df832c0cfc41995422df6db.tar.gz
frameworks_base-992f75bcd0ca37147df832c0cfc41995422df6db.tar.bz2
resolved conflicts for merge of 6687ecb4 to honeycomb-merge
Change-Id: Id9677d2ef1c03191cf73a7d90e80b57ea686afec
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions