| commit | 4ce87f0c886756aa9569d804e89074f9353ff7dc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 15:32:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 15:32:52 2012 -0700 |
| tree | 43036e6f9936ea7c078ee139ce64ed59dd817f39 | |
| parent | b120c17170655c91051b3e18123011666593d731 [diff] | |
| parent | a65891347556b4d14f6dad829017513b984d20c1 [diff] |
am a6589134: Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-dev-plus-aosp * commit 'a65891347556b4d14f6dad829017513b984d20c1': Unregister ContentObserver in InputMethodAndLanguageSettings class