Skip to content
Commit 616c4cc7 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

[automerger skipped] Merge "Use TM SubId in getDataState and getDataActivity"... 

[automerger skipped] Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev am: 7dad5ea7 -s ours
am: 3953c473 -s ours
am skip reason: change_id I035f2c44a7955e88608b1c336acb72fb68c3e450 with SHA1 af984d0d is in history

Change-Id: If9bd299eddf63de1fddc657739566a8a9ded5e96
parents d61e4e94 3953c473
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