OSDN Git Service

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

Trivial merge