OSDN Git Service

Merge "Do not set properties in bionic_systrace" am: e46ded5ce1
authorTom Cherry <tomcherry@google.com>
Fri, 11 Dec 2015 01:44:03 +0000 (17:44 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Dec 2015 01:44:03 +0000 (17:44 -0800)
commit7f7b6db617642197968ee5e3f2a60b3599b4096d
tree889ae81f32312dd19350b2e6406dc0e19bdde926
parent069ce3e454f809b173cb774f17dd520c58c99682
parent2b268b38ade7434a866a1bd10ff7b38cbb232917
Merge "Do not set properties in bionic_systrace" am: e46ded5ce1
am: 2b268b38ad

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