Nick Kralevich 701e73d3f6 am 4816f4b4: am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev ...

* commit '4816f4b4088ce35b2cddf1034ae483e30b7ed22c':
  Secure a handful of framework broadcasts

2012-11-30 10:43:24 -08:00

..

assets

…

res

am 7f05beb1: am 334a36b3: Merge "Change the text color of timer in MediaController"

2012-11-30 10:12:47 -08:00

Android.mk

…

AndroidManifest.xml

am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev

2012-11-30 10:35:44 -08:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…