| commit | 8d9b07edb1785983f60a317a6adbc6199f81788c | [log] [tgz] |
|---|---|---|
| author | Maggie Benthall <mbenthall@google.com> | Mon Apr 01 18:50:29 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 01 18:50:30 2013 +0000 |
| tree | 7ded268767f81879dcf671efce6ebf54d366d5fa | |
| parent | cb7b0b77ae04a84c75611a98a583c81208575ba5 [diff] | |
| parent | 6ad2e323f7733f39c6757a19a9ae9f5020cf9225 [diff] |
Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev