am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."

* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.

diff --cc core/java/android/app/ActivityThread.java
Simple merge

diff --cc core/java/android/content/Intent.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/am/CoreSettingsObserver.java
Simple merge