commit | d57a358b605dbf0be4c66c19a8085e61880ad3a7 | [log] [tgz] |
---|---|---|
author | Chen Xu <fionaxu@google.com> | Tue Nov 05 10:52:18 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 05 10:52:18 2019 -0800 |
tree | 74646f56f9d628891a6823f00db4aed124b33ca9 | |
parent | 96a1afa001afdb66c9e8602c934636c714d573a1 [diff] | |
parent | d0499521e93d0006420a8df200889f367a2013db [diff] |
[automerger skipped] Merge "new telephony annotation class" am: 7a16b069fa am: f0efc70a99 am: d0499521e9 -s ours am skip reason: change_id I8f4374bbe2f81b9a688c5c3699bafe4942859a1b with SHA1 21fb5e91ab is in history Change-Id: I909745c9386b9b1dd96b5bbbf1e3a5089a3683fe