Skip to content
Commit 7a6a6273 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

[automerger skipped] Merge "A get method for NR status in ServiceState" am:... 

[automerger skipped] Merge "A get method for NR status in ServiceState" am: c09b41ca am: 145fc054
am: 690885cb -s ours
am skip reason: change_id I07749ff00fc9d53796208ca78721b498ed4c16fd with SHA1 bbcd9123 is in history

Change-Id: Idd05448f5b712787496d1077beb2d1cc9cd20618
parents f23df2f3 690885cb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment