OSDN Git Service

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

Trivial merge