| commit | 9b5435f71c4cc7a3223a8768d74923f6ff5edfe5 | [log] [tgz] |
|---|---|---|
| author | goneil <goneil@google.com> | Fri Mar 30 23:29:33 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 30 23:29:33 2018 +0000 |
| tree | fe15fd1685a050dd3a54e2ee054ae3ef9f699d0e | |
| parent | c7d66a0f1608119bf5b9e55da23882049d16df4f [diff] | |
| parent | 4305df16f53fdc57486727188b17efebe6c790b1 [diff] |
[automerger skipped] Merge "Enforce read privileged phone state on get{Voice/Data}ActivationState" am: 6ae7906a83
am: 4305df16f5 -s ours
Change-Id: I93d0c9ac8972a45bede8517bc9c107f45cb8ba76