| commit | 2d637dc5fc799878704cbb53248b2954ed5d28c1 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:31:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:31:46 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | a8bf474e71ecee436913baaa29f993bd74b2d869 [diff] | |
| parent | 5e1d85a8e6a02b63e04c4d1f2c9548b7e71cae40 [diff] |
am 5e1d85a8: am a621699d: (-s ours) am da52f869: am 5b7c5dc0: Merge "Expose intention/content provider permission checks with annotations" into studio-1.4-dev automerge: 831a772 automerge: 0ca3c2d * commit '5e1d85a8e6a02b63e04c4d1f2c9548b7e71cae40':