OSDN Git Service

Merge "Add i2c tracing support to atrace" am: 2630e78f53 am: 8b6f035960 am: 1fd4f885dc
authorMichael Wright <michaelwr@google.com>
Fri, 20 Jan 2017 20:18:17 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:18:17 +0000 (20:18 +0000)
am: decf4e53b1

Change-Id: If9efc719e961e94e408380f483d8f32dd119b235


Trivial merge