| commit | 5947989fdb447b12fa9cc7140ee88afaed9bdfea | [log] [tgz] |
|---|---|---|
| author | goneil <goneil@google.com> | Sat Mar 31 02:05:30 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Mar 31 02:05:30 2018 +0000 |
| tree | b2ead697ad9ab1332f3f652944368a306a11da99 | |
| parent | 8f123992c29f3709457397dbfb3f1a8a492721be [diff] | |
| parent | 9b5435f71c4cc7a3223a8768d74923f6ff5edfe5 [diff] |
[automerger skipped] Merge "Enforce read privileged phone state on get{Voice/Data}ActivationState" am: 6ae7906a83 am: 4305df16f5 -s ours
am: 9b5435f71c -s ours
Change-Id: I772f6c215ffbd615432d1ace0e4bdc126e359cef