tree 22c83938493b76e644f1ee8526971a3cc1d06273
parent 8d61b3bae7ba4e3856fe539dd978704cb8c5af41
author Fred Quintana <fredq@google.com> 1464367825 -0700
committer Fred Quintana <fredq@google.com> 1464367825 -0700

Three-way merges of access.Permissions as well as tests.

This method is not hooked up anywhere yet.

Change-Id: I5b6c17b37d7127d1d6eddd37f97a8f8fe579beb1