From: Calin Juravle <calin@google.com>
Date: Mon, 30 Jun 2014 11:38:44 +0000 (+0000)
Subject: am d8cf54a0: am 2c3b68a3: Merge "Fix a string uint conversion bug in profiler"
X-Git-Tag: android-x86-6.0-r1~3285
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5b05daf30d28c57836611299f9bcb8d5c749a3b;p=android-x86%2Fart.git

am d8cf54a0: am 2c3b68a3: Merge "Fix a string uint conversion bug in profiler"

* commit 'd8cf54a0a14195be26422a6b3c3a5e90c0e1aa6b':
  Fix a string uint conversion bug in profiler
---

a5b05daf30d28c57836611299f9bcb8d5c749a3b