commit | 449c360cc530e64901c7b670c0a90a0c82ee421f | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Tue Jan 13 21:11:14 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 13 21:11:14 2015 +0000 |
tree | 3b28f548bd0622cba96d3aaf1e7aaee03b8b1667 | |
parent | b91be0cfc7f6ad19cb9025ac20448df336a7519a [diff] | |
parent | bcad54f6474b264a04a4f59fb8ad6371861f1a62 [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 automerge: bcad54f * commit 'bcad54f6474b264a04a4f59fb8ad6371861f1a62':