| commit | 642596f3cc2b3ddf582b93676ba067a48f05b4d0 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 05 22:43:50 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:43:50 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | e50892e01b01f5d2fa5bad4df1f5b2c0f507989c [diff] | |
| parent | 20861b8f16015c5e5b89bdc8025cc311aeff6883 [diff] |
am 20861b8f: (-s ours) am 35d525c9: am 998cfa2c: Merge "API to discover granted Uri permissions." into klp-dev * commit '20861b8f16015c5e5b89bdc8025cc311aeff6883':