| commit | ee27dd356e7257f553e8aec74d2c7dcbbde8bd5a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:02:22 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 07 13:02:22 2010 -0800 |
| tree | 7b0821cacc70d32154821c872982949d44eb82b0 | |
| parent | 8c30a47d801be50272098e60d0079ae1b4ebd22a [diff] | |
| parent | 12902d687fa1bd4bff3c2dfc079c71eacb00eedd [diff] |
am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master * commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd': Strings for NI position request are moved to resources