| commit | dfbf1a380ba0d6e0fb1dd070e861f006fd5283df | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Mon Nov 24 01:04:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 24 01:04:28 2014 +0000 |
| tree | ea2b4700cd2b4f4c1770b209e4f8e6415c5dfed0 | |
| parent | e872310625d799406a28d7b58c7d46cf17d2ee34 [diff] | |
| parent | 09b53849b2f85e1c1bf7ab471718c5013a9ba2dc [diff] |
am 09b53849: Merge "Fix bad merge in Telecom" into lmp-mr1-dev * commit '09b53849b2f85e1c1bf7ab471718c5013a9ba2dc': Fix bad merge in Telecom