summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-05-14 07:50:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-14 07:50:40 -0700
commit444889838ce46475f04956e8b6b027328917f3fe (patch)
tree3f5ad464ead110eb045a49bb0c98e17146c5c7cb /keystore
parentbbdc834a56576387353fb7b6a1f08363ad68796a (diff)
parentd0903e1478c7ba2fb8087f1bae1fba69791039ba (diff)
downloadframeworks_base-444889838ce46475f04956e8b6b027328917f3fe.zip
frameworks_base-444889838ce46475f04956e8b6b027328917f3fe.tar.gz
frameworks_base-444889838ce46475f04956e8b6b027328917f3fe.tar.bz2
am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING." into honeycomb-LTE
* commit 'd0903e1478c7ba2fb8087f1bae1fba69791039ba': TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions