tree a85f2de2544941d6068fc5f96e13b3cc173d871d
parent f6b8ccff822eaa45e386085957a28e534ecafbc6
parent 58e422c17ec8e168d8d7632cacbcd52e3353d2be
author Wei Wang <wvw@google.com> 1519172945 +0000
committer android-build-merger <android-build-merger@google.com> 1519172945 +0000

Merge "atrace.rc: enable schedstats by default" am: 7a8270d1ea
am: 58e422c17e

Change-Id: Ibfb06c7cd01dbd7d4322a42622b819ac77410dc1