tree a61b1d5967df2338eb875a3573367f49e6709624
parent 8e767115a888b78c5732fe935bd811a7db6bf2e1
parent 8d866e52b209cb683159f2701cc4204163de245c
author Dianne Hackborn <hackbod@google.com> 1349977476 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349977477 -0700

Merge "More on issue #7318666: hide developer options from user build" into jb-mr1-dev