summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-18 12:49:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-18 12:49:01 -0700
commit54525412c211033cf4f0a65323c86a55633698b0 (patch)
treebb07077f4a7d035033ee1df270e760ff3d2d3a24 /services/java/com/android/server
parent51a0c90b42a0088fa686b1f6e6768cd002d30033 (diff)
parent3aecdb9d7e92b1a91860600feefb5c0062b652cf (diff)
downloadframeworks_base-54525412c211033cf4f0a65323c86a55633698b0.zip
frameworks_base-54525412c211033cf4f0a65323c86a55633698b0.tar.gz
frameworks_base-54525412c211033cf4f0a65323c86a55633698b0.tar.bz2
am 3aecdb9d: merge from open-source master
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken * commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf': fix build Fix some typos and other cosmetic cleanups in telephony framework.
Diffstat (limited to 'services/java/com/android/server')
0 files changed, 0 insertions, 0 deletions