| commit | bd19c1bd9288c9feeec7df34ea4c2f1ee4d85cf5 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jul 31 17:22:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 17:22:33 2015 +0000 |
| tree | 7b25451dec73db9b76703c735f02b8e2b5aec348 | |
| parent | 2a23ef2817bc424c7b1f353394c4653463bd7522 [diff] | |
| parent | 4cfe2a8c0050a69e1793f41a60395b69277973b2 [diff] |
am 4cfe2a8c: am f26ec92d: am a21b2e30: resolved conflicts for merge of d0694da4 to mnc-dr-dev * commit '4cfe2a8c0050a69e1793f41a60395b69277973b2': Add telecom extra keys required for DMR release.