tree 05121f2cf4de9162fb4184ebe1989f4d3c05ca35
parent 133bb7734d0484a518531f8a35323a7f2cf3d23c
parent 8e45d94f766b7adaeacb384c7b426587cb7a22ef
author Yorke Lee <yorkelee@google.com> 1440674636 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674636 +0000

am 8e45d94f: (-s ours) am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND intent for Vcard" into mnc-dev

* commit '8e45d94f766b7adaeacb384c7b426587cb7a22ef':