| commit | 2255f771f0ec4fe8cf9a0edce3c544860985836d | [log] [tgz] |
|---|---|---|
| author | Ye Wen <ywen@google.com> | Fri Sep 26 15:25:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 15:25:49 2014 +0000 |
| tree | b08ae263be720116812442c44a18e6e47ce9a706 | |
| parent | 5c65836f583c1d6d3f135a395a59e9994776e694 [diff] | |
| parent | c914c95561b403bf35be82846abdf2862004bbbb [diff] |
am 933ddd11: am f0df354b: am 272f2321: am a0945b40: resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev * commit '933ddd112f22d3f3de2b1297dcf418287d8d0643': Hide carrier app intents in Telephony (1/2)