| commit | 40a060bcdae79112d502b20ec9c12db7aa62e7d8 | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Fri Sep 21 09:54:42 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 21 09:54:42 2012 -0700 |
| tree | 9ac2bf35bc2372dcfe9a4ca46cf6c0d4e935d36e | |
| parent | 9742238da426e3a02f47063d0ae7008ae2a57f73 [diff] | |
| parent | 08d7f2f95ad2240d45d89883fce434c5d5110602 [diff] |
am 08d7f2f9: resolved conflicts for merge of b1fbd696 to jb-mr1-dev bug:6809603 * commit '08d7f2f95ad2240d45d89883fce434c5d5110602': nl-rBE keyboard layout