OSDN Git Service

Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc...
authorAllen Hair <allenhair@google.com>
Tue, 28 Jun 2016 17:38:06 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Jun 2016 17:38:06 +0000 (17:38 +0000)
am: fb9d75e7cd

Change-Id: I4a5d45d9c33b713e6bdf0596ea498c3e521c26d8


Trivial merge