| commit | 3316f30add531059b4ed7ca6223d854074930490 | [log] [tgz] |
|---|---|---|
| author | Maggie Benthall <mbenthall@google.com> | Mon Feb 25 21:49:03 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 25 21:49:03 2013 +0000 |
| tree | f77bcf35b612164487f413df2bbfb6b2c0e69615 | |
| parent | bc8cbe5ce8e6784aae01201dfbe40c913f2ed843 [diff] | |
| parent | 40bbc3bb9997c6e9ea9aae42edd6bb4430d70978 [diff] |
am 40bbc3bb: Merge "Add location sharing toggle user restriction." into jb-mr2-dev * commit '40bbc3bb9997c6e9ea9aae42edd6bb4430d70978': Add location sharing toggle user restriction.