tree 5797ce3709bc320265cc9813cbf915f88d9c70d1
parent 7bdc9c01055b815a1198d9718e409ab6cc64fd00
parent ebce5c69331980d3ef1a5d7c1c7d62098f0fa471
author Mike Lockwood <lockwood@android.com> 1305575393 -0400
committer Mike Lockwood <lockwood@android.com> 1305575393 -0400

resolved conflicts for merge of fc4a3d37 to master

Change-Id: I40f603ba9330c3e882f4d58398095f4094725b21