OSDN Git Service

Merge changes I76513387,I335fb671 into gingerbread
authorJoe Onorato <joeo@google.com>
Tue, 12 Oct 2010 21:43:24 +0000 (14:43 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Oct 2010 21:43:24 +0000 (14:43 -0700)
commitba799098608c7be8ff1e18adfa7dc1f452205a7e
tree4c3ecd2dd93c054cd6ef63b284a6ad24a0d2f7ee
parenta310031438877a7b70a6ac30eb2f2b33e06907e6
parentb08a1af667b16cb1faaea2aec1cf2a0e4659cb3f
Merge changes I76513387,I335fb671 into gingerbread

* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam