am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master

Browse Source

* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources

...

This commit is contained in:

Jean-Baptiste Queru 2010-12-07 13:02:22 -08:00 committed by Android Git Automerger

parent 1218a4a2c4 f83c5e5eee

commit 82b2a4b94c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available