tree 0f4b568371561d4cf0a2ea9e196eff801e120888
parent 78bde35997ea17c479be760f1a1adc467abc7df0
parent 7b50c020302cb5079e98f895487c9cad29630a2a
author Yifan Hong <elsk@google.com> 1481038868 +0000
committer android-build-merger <android-build-merger@google.com> 1481038868 +0000

Merge "Check and write some error in atrace."
am: 7b50c02030

Change-Id: I562794bbe7dc52268ad2b477e0dca58a7b79d365