| commit | e61539518695fb3168d96d36cbe041b08297d5ea | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Thu May 18 15:19:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 18 15:19:17 2017 +0000 |
| tree | a9225ae8f186563bcbc29160c1e722bc9f3cb1e8 | |
| parent | ba17396723267b2e959236befb470e134cdb2780 [diff] | |
| parent | 360ccaa3da14e06b76d4ca55afc122cb309c67d1 [diff] |
Merge "Consolidated all data allow/disallow logic into one method" am: 5d3bcfc78d am: 5bc6ab6445 am: 4eb31320fd am: 360ccaa3da -s ours Change-Id: I212a2aa827fcc1e3d657fc8f750ad409367428e8