OSDN Git Service

Merge "Fix build." into klp-dev
authorDianne Hackborn <hackbod@google.com>
Sun, 8 Sep 2013 20:08:42 +0000 (20:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 8 Sep 2013 20:13:13 +0000 (20:13 +0000)

Trivial merge