commit | c68a777ca3a46c43a39819ad3fea06d27b904127 | [log] [tgz] |
---|---|---|
author | Chen Xu <fionaxu@google.com> | Tue Nov 05 10:52:34 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 05 10:52:34 2019 -0800 |
tree | 9639489dd2d34a6eb7141754d117d62804ab4eb0 | |
parent | f1197e41e8894f897f44507bc6703c8c2e8dccc2 [diff] | |
parent | 11057e516acbecaea31d979700ff068cdae253b7 [diff] |
[automerger skipped] Merge "new telephony annotation class" am: 9e2e989423 am: 2344dd0745 am: 11057e516a -s ours am skip reason: change_id Ib4e774fc93c0b3ebed70775d4a613621b9c7778a with SHA1 227e06fddd is in history Change-Id: I67bf0b69e3757b849217b922b4fd6b2b313342cd