| commit | d78b94a96bdbfe5b9742c50f221c2923fdd9be8e | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Tue Oct 08 13:07:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 13:07:49 2013 -0700 |
| tree | 17251882c4577a14549772eaafb8a8cb7c0c09cb | |
| parent | 674d72220a586008c30329327713352f37d64b53 [diff] | |
| parent | 59089be16eb398647b46c40324ae32de4f7d8736 [diff] |
am 59089be1: am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev * commit '59089be16eb398647b46c40324ae32de4f7d8736': Out with the sliders, in with the cog.