tree 59fa252f9794fcb967253d0069094db7c699585b
parent 5e0ecb75dd1fe0b4dd2e30846f409f90116e9758
parent 53859740213b42fd00f0ce6d059b58322b41534c
author Joe Onorato <joeo@google.com> 1302140714 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1302140714 -0700

Merge changes I4011db5c,I622bc5fa

* changes:
  less logging
  A system setting for "advanced settings."