Alex Klyubin fbf1472d61 resolved conflicts for merge of a978a3d6 to master ...

Change-Id: Ifd7ca9e1dfa0d50a87f2bafef377fcaeb5d9f6d5

2015-04-13 10:54:53 -07:00

..

java/android/security

resolved conflicts for merge of a978a3d6 to master

2015-04-13 10:54:53 -07:00

tests

Merge "Fix testSaw_ungrantedUid_Bluetooth"

2015-04-10 21:42:23 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…