tree cbfb58f558b829fc332544a6381966e26bfc51ab
parent 58118ccc565db991cd82ae5f4cbd0a5057438dbc
parent e1daf61d43a4252594e1e51060f342480ea26d42
author Doug Zongker <dougz@android.com> 1285125032 -0700
committer Doug Zongker <dougz@android.com> 1285125032 -0700

resolved conflicts for merge of e1daf61d to master

Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9