commit | 59089be16eb398647b46c40324ae32de4f7d8736 | [log] [tgz] |
---|---|---|
author | Daniel Sandler <dsandler@android.com> | Tue Oct 08 13:05:11 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 13:05:11 2013 -0700 |
tree | e116a15711024d84df3e64203426cc8d70991190 | |
parent | d00284c3affb40ed7245327e7ec7b08f13c1ba8f [diff] | |
parent | cd85db331dd319d63f57f7b4c942bc506606b5b0 [diff] |
am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev * commit 'cd85db331dd319d63f57f7b4c942bc506606b5b0': Out with the sliders, in with the cog.