tree afa312d2cfc9eea88205aea7d19cec01c071dbea
parent 78ae7ba21055fbb0fb39aba54b2444bd0fbccf6a
parent 7d0b0ba3e988ac33ab9357ea11a03944d3cc4365
author Andres Morales <anmorales@google.com> 1452721354 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452721354 +0000

Merge "fix gatekeper_device_test"