Irfan Sheriff be3d645798 am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml." ...

# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit 'a56711a04618bbdcdaecf15e1815a5618e6b4737':
  Remove config_wifi_p2p_support from config.xml.

2013-01-28 08:16:23 -08:00

..

assets

…

res

am a56711a0: am 169dc398: Merge "Remove config_wifi_p2p_support from config.xml."

2013-01-28 08:16:23 -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

…