OSDN Git Service

Merge commit '210648c40e7c2001cc2a52df532a6ae8f89ac029' into mnc-dr2-dev-plus-aosp
authorQiwen Zhao <zhao@google.com>
Thu, 19 Nov 2015 23:41:08 +0000 (15:41 -0800)
committerQiwen Zhao <zhao@google.com>
Thu, 19 Nov 2015 23:41:08 +0000 (15:41 -0800)

Trivial merge