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

* commit '0def7b94960ae551c498212d97c7919da7529429':
  Secure a handful of framework broadcasts

2012-11-30 10:40:18 -08:00

..

assets

…

res

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

2012-11-30 09:55:34 -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

…