Filip Gruszczyński b50cea0267 resolved conflicts for merge of 1569d61f to master ...

Change-Id: I5bc751a2ae52a8d7542b5b49d27fc90b4a1c7673

2014-03-05 17:56:40 -08:00

..

assets

…

res

resolved conflicts for merge of 1569d61f to master

2014-03-05 17:56:40 -08:00

Android.mk

…

AndroidManifest.xml

Updating wording around PROCESS_INCOMING_CALL.

2014-03-04 18:51:18 -08:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…