tree 97d562812e3ebf9be5501896c0c6c91c3312f5f8
parent 87673f406ba074878fc3f88789ce256a8385e6ce
parent 29243a834c0760588d004f87e68b2485f608ef60
author Michael Schwartz <schwartzmi@google.com> 1512100630 +0000
committer android-build-merger <android-build-merger@google.com> 1512100630 +0000

Merge "Do not archive the logs directory" am: 11c7f85510 am: 27f08495d5
am: 29243a834c

Change-Id: Ia532de7ae1e228f168be3ec0109421d900f4b837