| commit | 68bdfadf298615e17be3daf0bdd2e120cf62ec10 | [log] [tgz] |
|---|---|---|
| author | Mindy Pereira <mindyp@google.com> | Sun Oct 10 17:45:13 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 10 17:45:13 2010 -0700 |
| tree | e5d83844895c994e09b7bd0be1a3659f45eeaf19 | |
| parent | ca936f1661a1cd3ccf45343e0453bc942fb94aeb [diff] | |
| parent | ab70a98b0ec450379fa953a9fe911109329b9c37 [diff] |
am ab70a98b: (-s ours) am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay. Merge commit 'ab70a98b0ec450379fa953a9fe911109329b9c37' * commit 'ab70a98b0ec450379fa953a9fe911109329b9c37': DO NOT MERGE Adjust amount pull effects the glow and edge decay.