tree 0537ccb314fee95bd7d842d076f920ecc9d26744
parent 0d74973a08ebe4b7547100f7d60db07152cbbcd4
parent 9917ebed862ed8b687f5d17779c4e250fb5a30f6
author Calin Juravle <calin@google.com> 1414696260 +0000
committer android-build-merger <android-build-merger@google.com> 1414696260 +0000

am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev
automerge: 9917ebe

* commit '9917ebed862ed8b687f5d17779c4e250fb5a30f6':
  Fix the length of a profiler system property