OSDN Git Service

am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicit...
authorElliott Hughes <enh@google.com>
Sat, 3 Aug 2013 00:58:33 +0000 (17:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 3 Aug 2013 00:58:33 +0000 (17:58 -0700)
* commit '710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a':
  If frameworks wants ASCII casing, it should explicity ask for it.

1  2 
core/java/android/content/Intent.java
core/java/android/net/Uri.java
core/java/android/provider/Settings.java

Simple merge
Simple merge