| commit | 6f8f45f0006caf1a6094d54746df92012187df20 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Sat Sep 13 01:58:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 13 01:58:30 2014 +0000 |
| tree | c28f606897c391780603a9258f1db49ba1a59b4b | |
| parent | 99a56b94c7a4e88862167df382f9f9c0b1b94084 [diff] | |
| parent | 64176158e7ce9c99365d20433c81012ea7e36729 [diff] |
am 64176158: resolved conflicts for merge of 75513e51 to master * commit '64176158e7ce9c99365d20433c81012ea7e36729': Fix not always showing input view with physical keyboard connected