commit | b69010ef249fef701852522c4effc2197212ec0b | [log] [tgz] |
---|---|---|
author | Tor Norbye <tnorbye@google.com> | Mon Jul 06 16:56:46 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 06 16:56:46 2015 +0000 |
tree | 14c0cbaacb86002df420a8efb86fc23ab332cddc | |
parent | 9431a82e2d5d708ea9437f1bb06a4e0520c5e001 [diff] | |
parent | a59bf59fd1f337d72b38ecf147d2cd512790bfd5 [diff] |
Merge "Annotation-driven content resolver and intent permission checks" into studio-1.4-dev automerge: b9b58db automerge: a59bf59 * commit 'a59bf59fd1f337d72b38ecf147d2cd512790bfd5': Annotation-driven content resolver and intent permission checks