tree 7894565f9460b2bb2f88a345e645263fc546315f
parent f06675e2a47d0e9322f8a619e84f72882cec039d
parent a4a50996acce7aaefc268e702eebdbacb0bbf561
author Doug Zongker <dougz@android.com> 1283545358 -0700
committer Doug Zongker <dougz@android.com> 1283545358 -0700

resolved conflicts for merge of a4a50996 to master

Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a