OSDN Git Service

Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c am: 1e80b276b1
authorChris Craik <ccraik@google.com>
Tue, 24 Jan 2017 20:12:37 +0000 (20:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 20:12:37 +0000 (20:12 +0000)
am: 34437aaf8b

Change-Id: Iad5acf496655bcc84ffc0b5d7568c64b4f0f7f80


Trivial merge