diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-19 18:11:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-19 18:11:44 -0700 |
| commit | cf1620d6dd6c172a2a3bf91d2d9c137527218629 (patch) | |
| tree | bfb5083d9ca7803998817a5bef645ecf7f943a84 /core/java/android/inputmethodservice/AbstractInputMethodService.java | |
| parent | b5994789af9c676f8e067a4a8706d2177b7cc142 (diff) | |
| parent | 5b930c49b12bdb1461a18491db768c642c38d498 (diff) | |
am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
Diffstat (limited to 'core/java/android/inputmethodservice/AbstractInputMethodService.java')
0 files changed, 0 insertions, 0 deletions