Merge "Renaming intent action for unknown sources" into oc-dev am: a609bbc9c4

am: 56fa529c28

Change-Id: I28f085f5ea2b2d94c23a42f69ce19ea6c8d5c94f

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/content/pm/PackageManager.java
Simple merge

diff --cc core/java/android/provider/Settings.java
Simple merge