John Spurlock a943b0337c am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp ...

* commit 'c5b6267dac35300821e6b6e062370d0ee935acc1':
  Update resource name for renamed string.

2013-10-15 16:18:07 -07:00

..

assets

…

res

am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp

2013-10-15 16:18:07 -07:00

Android.mk

Remove the unnecessary framework-res-package-target

2013-02-12 17:18:44 -08:00

AndroidManifest.xml

am 5f7f97e0: am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev

2013-10-14 10:48:23 -07:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…