OSDN Git Service

Merge "Make ScopedAssertNoThreadSuspension no overhead for non-debug" am: 26ead4975e
authorMathieu Chartier <mathieuc@google.com>
Wed, 14 Sep 2016 17:03:17 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 17:03:17 +0000 (17:03 +0000)
am: 120e0b7028

Change-Id: I5337e58fa10e8249a9f4b1b6b83bcd870fd42dbe


Trivial merge