tree eaaee379e22345ec7204448a865df384c35cf5a3
parent 257d565a9d374fd3a22d4732004f77ee1459083b
parent 253bd01f659ed14aeb2352a0296ba9bf58a0b37e
author Ben Murdoch <benm@google.com> 1411398802 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411398802 +0000

am 253bd01f: am a1f40f93: Pass ClipData in media capture Intent.

* commit '253bd01f659ed14aeb2352a0296ba9bf58a0b37e':
  Pass ClipData in media capture Intent.