tree cd94fb1681bc08f6dac3f34e9a7f003742441e5c
parent f4848f63ad6041fcc01ad1f520ccc0ceddd80f61
parent 27604fcbee0010b800bfc16b5bf7a48c365c2cf3
author Qiwen Zhao <zhao@google.com> 1447973760 -0800
committer Qiwen Zhao <zhao@google.com> 1447973760 -0800

Merge commit '27604fcbee0010b800bfc16b5bf7a48c365c2cf3' into mnc-dr2-dev-plus-aosp