OSDN Git Service

am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to...
authorYe Wen <ywen@google.com>
Fri, 26 Sep 2014 00:23:09 +0000 (00:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 00:23:09 +0000 (00:23 +0000)
* commit 'f0df354b0aa1880bae34034cc83ec472e5ff404e':
  Hide carrier app intents in Telephony (1/2)


Trivial merge