tree d37922f6f059d9a242bf4ef3b29c90e127c1c175
parent f291d858f8c9bf40051d50adfd10e758aa222315
parent c02c37a1e6bd67198a6522461b81c9cdd125625e
author Doug Zongker <dougz@android.com> 1278692031 -0700
committer Doug Zongker <dougz@android.com> 1278692031 -0700

resolved conflicts for merge of c02c37a1 to master

Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc