| commit | 1eaac4559f4c2e5ed66cc2f17dab98bb3015540e | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Tue Oct 08 16:02:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 16:02:13 2013 -0700 |
| tree | b5b8cff76c2e845fa41f7c4afc412fc10425d080 | |
| parent | 359f248480d58a063dd953e6fe5dbb81eee5f6f0 [diff] | |
| parent | d78b94a96bdbfe5b9742c50f221c2923fdd9be8e [diff] |
am d78b94a9: am 59089be1: am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev * commit 'd78b94a96bdbfe5b9742c50f221c2923fdd9be8e': Out with the sliders, in with the cog.