tree 59dab4628b7dbc6a73b797679b2dc3f3eaa1d6a3
parent 6a678726738a4183b490fa2d4853c5b8442d5f8e
parent 23c7fe7195206fa6625de26a9129178d21f0d6a9
author Wei Wang <wvw@google.com> 1476305416 +0000
committer android-build-merger <android-build-merger@google.com> 1476305416 +0000

Merge "Move atrace init into on fs trigger" am: 8fee401726
am: 23c7fe7195

Change-Id: I6f5871db3c55845f1eba18e5a7ab2be57332ce22