OSDN Git Service

Merge changes I4011db5c,I622bc5fa
authorJoe Onorato <joeo@google.com>
Thu, 7 Apr 2011 01:45:14 +0000 (18:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2011 01:45:14 +0000 (18:45 -0700)
commit03218c08bacdff532d152e259568e76fabf55101
tree4424d3b1b7353c13c3d3e6283e1e56d0fcd53078
parentbaa1aa6667a205b76d24821fd92691b9377b874a
parent02e06ea9f73f71e48f9ba58779f8494a1d9e5ea8
Merge changes I4011db5c,I622bc5fa

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