OSDN Git Service

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

Trivial merge