OSDN Git Service

Merge "Changes made to accomodate GSA in Google3 w/ Robolectric" into ub-now-master
authorCameron Neale <cdneale@google.com>
Wed, 5 Nov 2014 19:34:15 +0000 (19:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 5 Nov 2014 19:34:16 +0000 (19:34 +0000)

Trivial merge