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