Skip to content
Commit c6274feb authored by Nate(Qiang) Jiang's avatar Nate(Qiang) Jiang Committed by android-build-merger
Browse files

[automerger skipped] Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev am: e3ff000c 

am: d76f4079 -s ours
am skip reason: change_id Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3 with SHA1 ee9a5ae1 is in history

Change-Id: I3c5ec1e9a177a15144e7ddeb0caa0a1dadbfb740
parents 549d6140 d76f4079
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