Android (Google) Code Review a85449895a am 65e9d228: Merge change 6629 into donut ...

Merge commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb'

* commit '65e9d2285e5d5eab6a822d4a8210ffcc45b6b0bb':
  Rename "no" arrays.xml file to be in the correct "nb" locale.

2009-07-09 12:50:49 -07:00

..

assets

Automated import from //branches/master/...@141533,141533

2009-03-24 20:29:58 -07:00

res

am 65e9d228: Merge change 6629 into donut

2009-07-09 12:50:49 -07:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

AndroidManifest.xml

resolved conflicts for merge of 2af632f8 to master

2009-07-09 12:15:46 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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