Commit 1cee84a7 authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

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

[automerger skipped] Merge "Revert "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""" am: b8d122e2  -s ours
am: 05b49c53  -s ours

Change-Id: I3ab8491389be18b96fea9cf2e45ccdc462bac440
parents 31a466e8 05b49c53
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