tree 6993687d0c39d4fe3303d40166c0ad7450e9e969
parent bf81e1e16167ded03c2170658ed957c85b0a0133
parent 5c8f92bedf1421dc3014d40dc4322f78505e1fdb
author The Android Open Source Project <initial-contribution@android.com> 1274212141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274212141 -0700

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.