OSDN Git Service

Merge "Fix regression"
authorMarco Nelissen <marcone@google.com>
Wed, 19 Feb 2014 00:10:19 +0000 (00:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Feb 2014 00:10:19 +0000 (00:10 +0000)

Trivial merge