Eric Fischer f7573bd2b7 resolved conflicts for merge of cdb9e971 to master

2009-07-28 11:27:07 -07:00

..

drawable

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

values

resolved conflicts for merge of cdb9e971 to master

2009-07-28 11:27:07 -07:00

values-cs

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-de

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-es

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-fr

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-it

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-nl

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-pl

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00

values-zh-rTW

Mark the the airplane mode internal strings as not translatable.

2009-07-28 10:17:25 -07:00