OSDN Git Service

Merge "Fix NPE when runnin testActivity" into nyc-dev
authorDiego Perez <diegoperez@google.com>
Thu, 7 Apr 2016 19:02:33 +0000 (19:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2016 19:02:34 +0000 (19:02 +0000)

Trivial merge