| commit | cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Tue Jan 13 19:10:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 19:10:40 2015 +0000 |
| tree | 9eae1863fb673530af334057d92f5f0f9192527d | |
| parent | a908d8191acf3e4786933d67a1a4211543323a7d [diff] | |
| parent | 28bb4cda830b2cdfce6fe83cf1e4d91de3f16a59 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev