Filip Gruszczynski 36f5c7dd42 am 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev ...

* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""

2015-06-01 19:03:59 +00:00

..

assets

…

res

am 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

2015-06-01 19:03:59 +00:00

Android.mk

…

AndroidManifest.xml

am 98bc46d1: am 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev

2015-05-28 18:23:09 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…