Merged from master-tungsten:
commit 43a2825a283e29c0f70100146394957af0598b0e
Author: John Grossman <johngro@google.com>
Date: Wed Apr 27 09:03:53 2011 -0700
Add the ability to pass float extras to AM.
Change-Id: I970ad3f76a65bd781099204019095c73ed8c09db
Change-Id: I4ab21f20da4529069479bc822ed20aa05d161357
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>