OSDN Git Service

Merge "Fix compilation error on emerald-dev" into cw-e-dev
authorChing Tzung Lin <ctlin@google.com>
Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)

Trivial merge