tree 7907792464c0ebb497cd629d5a3ab4397a8f5899
parent 8b717e7ad12f07b19870bb37251c0cf20093381d
parent d75fdb6fe3745805561dec630540e8449d97e2f8
author Calin Juravle <calin@google.com> 1447261994 +0000
committer android-build-merger <android-build-merger@google.com> 1447261994 +0000

Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050 am: 61abae774e
am: d75fdb6fe3

* commit 'd75fdb6fe3745805561dec630540e8449d97e2f8':
  Parse method-trace properties only in debug builds.