tree e239db9fa44fa410eb84a85d7c210c7501e84481
parent 891180320f0b08758d053a8562dfcd601ef846b0
parent 5f5d5c8cef10f28950fa108a8bd86d55f11b7ef4
author Nick Kralevich <nnk@google.com> 1279579985 -0700
committer Nick Kralevich <nnk@google.com> 1279579985 -0700

resolved conflicts for merge of 5f5d5c8c to gingerbread

Change-Id: Ieee2cd67d33f3e774fcfd96f8a5f67a0374aa873