tree 3baa946487cc3d755379392ccbfc1932e665588c
parent 73e6e96818027801aa8b9ee740ff966ca5ad8db4
parent 3b4304ad7ad92404db8aca00cbbf5d58cfc8153c
author Romain Guy <romainguy@android.com> 1259100064 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259100064 -0800

am 3b4304ad: am 99917ca6: Save 4 MB of space.

Merge commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c' into eclair-mr2-plus-aosp

* commit '3b4304ad7ad92404db8aca00cbbf5d58cfc8153c':
  Save 4 MB of space.