| commit | f8eece5ad70091bf6028d35bca479a66488cc4f9 | [log] [tgz] |
|---|---|---|
| author | Ye Wen <ywen@google.com> | Thu Sep 25 18:44:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 18:44:04 2014 +0000 |
| tree | c9be1de8bea932a884d4ee5c31cf5ae516f1b0e1 | |
| parent | 05b1f42dd01444dc5c020eb0c3a309a7534231b6 [diff] | |
| parent | ba049f7632e688d9314713211fbf08ff9fe256da [diff] |
am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev * commit '272f232181345089bd0f4a9b8356772204bcc0cb': Hide carrier app intents in Telephony (1/2)