summaryrefslogtreecommitdiffstats
path: root/voip/java/android
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-10 14:18:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-10 14:18:53 -0700
commit6450a4af26999a6766dabe407571634fdacba9ba (patch)
tree47811f13f55bcbc82b795cc4b923248dfa6d111f /voip/java/android
parent91a359e0d1f1ca7318a115b258ce67b107d96821 (diff)
parent647ff64596399e0fa234622302e03facf84ee3f6 (diff)
downloadframeworks_base-6450a4af26999a6766dabe407571634fdacba9ba.zip
frameworks_base-6450a4af26999a6766dabe407571634fdacba9ba.tar.gz
frameworks_base-6450a4af26999a6766dabe407571634fdacba9ba.tar.bz2
am 647ff645: am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread
Merge commit '647ff64596399e0fa234622302e03facf84ee3f6' * commit '647ff64596399e0fa234622302e03facf84ee3f6': Use explicit intent for installing credentials.
Diffstat (limited to 'voip/java/android')
0 files changed, 0 insertions, 0 deletions