Commit 05b49c53 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

Change-Id: I8129313c986eb68ed6862bab50ed284127a38358
parents 9e068aa3 b8d122e2
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