tree 889ae81f32312dd19350b2e6406dc0e19bdde926
parent 069ce3e454f809b173cb774f17dd520c58c99682
parent 2b268b38ade7434a866a1bd10ff7b38cbb232917
author Tom Cherry <tomcherry@google.com> 1449798243 -0800
committer android-build-merger <android-build-merger@google.com> 1449798243 -0800

Merge "Do not set properties in bionic_systrace" am: e46ded5ce1
am: 2b268b38ad

* commit '2b268b38ade7434a866a1bd10ff7b38cbb232917':
  Do not set properties in bionic_systrace