summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-07 12:36:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-07 12:36:33 -0700
commit05dff838946abb01caa3c3172cf0f367964a0b6d (patch)
tree566fe20167776e06e8290d13ab99323c6b95a3be /telephony
parentb8bcfed5524a37ee51e3f1129f1df91bc4a59cb4 (diff)
parent11bbe200cba150cfa5593bb87b54f3072a5ab2c5 (diff)
downloadframeworks_base-05dff838946abb01caa3c3172cf0f367964a0b6d.zip
frameworks_base-05dff838946abb01caa3c3172cf0f367964a0b6d.tar.gz
frameworks_base-05dff838946abb01caa3c3172cf0f367964a0b6d.tar.bz2
am 11bbe200: Hopefully fix the build.
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp * commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5': Hopefully fix the build.
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions