commit | 57f132d0862369899e937664c45f35e220db4cf7 | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Fri Mar 27 01:24:58 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:24:58 2015 +0000 |
tree | a35aa00dfdf5d1d45fd5884e3eeac7fe6c583553 | |
parent | 1730be6f29771cb1bfa25dae66e1f508b30fbef9 [diff] | |
parent | f64321184cbe64ab010ffd2fde9bbd543bec9299 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev