| commit | 9526df07f2c0033443c79069239891386b321ac4 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 22:05:29 2019 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 22:05:29 2019 +0000 |
| tree | ccc5ed363e98d2beb929d9952623c5bbf1964a7e | |
| parent | 425c15a5fb68d979af84ac447e252320108d8223 [diff] | |
| parent | 1b539142be85390d2c5bb8f1ceb661039e231a36 [diff] |
[automerger skipped] Merge "ServiceState merges voice and data into a single value" am: 63c973ceff am: b7cdbcafed am: 1b539142be -s ours am skip reason: Change-Id Iecc312a95dccd444d3f87ac8a25d6881745a17c4 with SHA-1 31ca2ad0f4 is in history Change-Id: Idb5b1f1aadaed53d76ba70c8a6c8cb744db40ebc