Commit 2f5c52de authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Copy files related to sdk dev... 

[automerger skipped] Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" into stage-aosp-master am: d4447a13
am: a5c2c0a2  -s ours

Change-Id: I262b1521f30feff4cb02b4ef105fa593d8298433
parents f33fa3b4 a5c2c0a2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment