Merge "Allow applications to define failure handlers" into oc-mr1-dev am: e551d361ac

am: 4cb468814c

Change-Id: Idc4d9eec433255f653a8cc842ce73f2d436973e4

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 services/core/java/com/android/server/am/ActivityStarter.java
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge