| commit | c914c95561b403bf35be82846abdf2862004bbbb | [log] [tgz] |
|---|---|---|
| author | Ye Wen <ywen@google.com> | Fri Sep 26 00:23:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 00:23:09 2014 +0000 |
| tree | 141f1470f989a6feecdf19427ba9f6de4296f046 | |
| parent | 6c49e6e923e993b18beaf7808337a7c2c6b26b70 [diff] | |
| parent | f8eece5ad70091bf6028d35bca479a66488cc4f9 [diff] |
am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev * commit 'f0df354b0aa1880bae34034cc83ec472e5ff404e': Hide carrier app intents in Telephony (1/2)