OSDN Git Service

Merge "Merge commit '3de70a1d6a1b8c0e7febce5e8fc4f0b3ad400b7d' into merge_work"
authorPrerepa Viswanadham <dham@google.com>
Sun, 12 Apr 2015 21:56:29 +0000 (21:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 12 Apr 2015 21:56:30 +0000 (21:56 +0000)

Trivial merge