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