From: Chris Craik <ccraik@google.com>
Date: Tue, 24 Jan 2017 20:12:37 +0000 (+0000)
Subject: Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c am: 1e80b276b1
X-Git-Tag: android-x86-8.1-r1~68^2~29
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a501546d8f;p=android-x86%2Fsystem-extras.git

Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c am: 1e80b276b1
am: 34437aaf8b

Change-Id: Iad5acf496655bcc84ffc0b5d7568c64b4f0f7f80
---

a501546d8f6c9b1ee2a9a9218c16431c1de7b8ab