OSDN Git Service

am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 21:02:22 +0000 (13:02 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Dec 2010 21:02:22 +0000 (13:02 -0800)
commit82b2a4b94c52846128ea57afe27b388d4869b0bd
treec13b8f7fee038c7f5186bea18102acae82d1066c
parent1218a4a2c4d1136e9e633acb9fa2559dc6fbba79
parentf83c5e5eee3395be6a444cde68a135902aa4d9e7
am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master

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