OSDN Git Service

Merge "Update testActivity"
authorJerome Gaillard <jgaillard@google.com>
Fri, 11 Nov 2016 12:56:45 +0000 (12:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Nov 2016 12:56:51 +0000 (12:56 +0000)

Trivial merge