tree b7bcc3de00297eac3b1982207d093e7f1ce298dd
parent 0268750a94d29f2855069cd18e363d7e840074cd
parent 92586ef3da0679fea79b64ea33c02eef0dcfca97
author Treehugger Robot <treehugger-gerrit@google.com> 1495090173 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1495090174 +0000

Merge "Consolidated all data allow/disallow logic into one method"