tree 14872163cb28cfd4b0c81f0418cfc27db95c352d
parent 0c2bfcaa896c8acf9a4a9fc23d089a9525b12a7a
parent 3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9
author Qiwen Zhao <zhao@google.com> 1447976505 -0800
committer Qiwen Zhao <zhao@google.com> 1447976505 -0800

Merge commit '3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9' into mnc-dr2-dev-plus-aosp