| commit | 1cee84a73ad7600bf8b4315757ed406f72622953 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <nanzhang@google.com> | Mon Aug 06 19:00:22 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 06 19:00:22 2018 -0700 |
| tree | 38ff162aa5ee3bb7321b8734e50b09ff021242d1 | |
| parent | 31a466e8f67a82da5b5b566f9326355c6c4decd5 [diff] | |
| parent | 05b49c530315c966d183bafe0051db01baf98bb8 [diff] |
[automerger skipped] Merge "Revert "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""" am: b8d122e2b5 -s ours am: 05b49c5303 -s ours Change-Id: I3ab8491389be18b96fea9cf2e45ccdc462bac440