tree ff6859fa2bb327d69c51a61da9d2734a332516b7
parent 37be299adaee93331d5830d48321ee5c14b35ffc
parent a574d1c922d31c98a87d34281fef967a9caf92a9
author Nan Zhang <nanzhang@google.com> 1532983304 -0700
committer android-build-merger <android-build-merger@google.com> 1532983304 -0700

Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk"
am: a574d1c922

Change-Id: I2370f0bc1f6e8a837b1a6b72be9703d3b31cab48