OSDN Git Service

Merge "Consolidated all data allow/disallow logic into one method" am: 449d73251f
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>
Thu, 18 May 2017 09:15:30 +0000 (09:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 09:15:30 +0000 (09:15 +0000)
am: ab0f6fc5d2

Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4


Trivial merge