tree 38dfbf076ed941cf43fd55dc81d93af2e54dad99
parent 5e7bb0a9cafc5e90bf451faa5722bb80fb4294e9
parent 21875ab33291d4c25bd9701e7ac51c589e665177
author Mike Lockwood <lockwood@android.com> 1265120137 -0500
committer Mike Lockwood <lockwood@android.com> 1265120137 -0500

resolved conflicts for merge of 21875ab3 to master

Change-Id: I447e813b3ec460bbc9050de6b95bd663bb33c86f