| commit | 04fec61d12b2a251c338e7fb84c5135858486a8d | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@google.com> | Tue Oct 07 18:27:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 18:27:00 2014 +0000 |
| tree | a71286416890b7bb9d974235a31dd2fef913fe40 | |
| parent | 51d0622fbad1fb4f2fdf1fb7e925bdcb32d6cad0 [diff] | |
| parent | de30cb1966e6d2250756934fa7e5cf0f5fd48858 [diff] |
am de30cb19: am e39876d5: am 0f331071: (-s ours) Merge "Tuning artwork and physics." * commit 'de30cb1966e6d2250756934fa7e5cf0f5fd48858':