| commit | a6bda47db5cea2ad52aa6038a03b224ddde28748 | [log] [tgz] |
|---|---|---|
| author | Alexandra Gherghina <alexgherghina@google.com> | Wed Jul 23 15:29:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 23 15:29:47 2014 +0000 |
| tree | 1c5cc66701c3fb71adb4ef253924409abcf815ea | |
| parent | 4b94247b30ec6501b7d01d61cdf7c327f6a5d1c1 [diff] | |
| parent | 41aa08c3c284a98f90a5a114c1111419e96b78ac [diff] |
am 41aa08c3: am 00874018: Merge "Whitelist Settings app to keep in the managed profile" into lmp-dev * commit '41aa08c3c284a98f90a5a114c1111419e96b78ac': Whitelist Settings app to keep in the managed profile