OSDN Git Service

Merge "Changes to support automated test framework"
authorTodd Kjos <tkjos@google.com>
Fri, 11 Dec 2015 16:09:08 +0000 (16:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Dec 2015 16:09:08 +0000 (16:09 +0000)

Trivial merge