OSDN Git Service

Merge "Fix broken unit test"
authorDavid Christie <dnchrist@google.com>
Tue, 6 Aug 2013 16:56:16 +0000 (16:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Aug 2013 16:56:16 +0000 (16:56 +0000)

Trivial merge