OSDN Git Service

am 384fc141: (-s ours) am d0694da4: Merge "Add telecom extra keys required for DMR...
authorTyler Gunn <tgunn@google.com>
Thu, 27 Aug 2015 09:42:50 +0000 (09:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:42:50 +0000 (09:42 +0000)
* commit '384fc14102dad21dd9875b8dccb2b2bfa5bc25a2':


Trivial merge