Vinod Krishnan a58405ef46 am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master" ...

* commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0':
  Adding a margin for the AlertDialog to work on circular UI.

2014-05-09 22:26:04 +00:00

..

assets

…

res

am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master"

2014-05-09 22:26:04 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Disallow the INTERACT_ACROSS_USERS permission for system apps"

2014-05-08 09:40:13 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…