tree 21518fb309e87a734cb1d723d5d87692721391bc
parent cf88cf878be96a564b38f428c161cc864dfad56d
parent a4e95dfea4f3635d6cb845873fce0566c20cc88e
author Kenny Root <kroot@google.com> 1286843167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286843167 -0700

am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread

Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp

* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
  Grant URI permissions to the MCS