commit | bcad54f6474b264a04a4f59fb8ad6371861f1a62 | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Tue Jan 13 19:16:06 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 19:16:06 2015 +0000 |
tree | 3f3f7e9b5fc5270a5870a805a6fc1a9669cfa66c | |
parent | 1015f08455da4c0823d98d5f74104e0fc3b7de33 [diff] | |
parent | cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4 [diff] |
am cc26e1dc: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev * commit 'cc26e1dc5c6f7437678dfe5c0b230bf59879d8f4':