OSDN Git Service

DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: 2026ca147b ...
authorFelipe Leme <felipeal@google.com>
Fri, 9 Dec 2016 10:27:35 +0000 (10:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 10:27:35 +0000 (10:27 +0000)
am: 153604cd9a

Change-Id: Icaa4e18775b6e810738fb9d180ea20f7ce5c4506


Trivial merge