tree 0bcb5e49816728306362956ff5edfa144ff72d75
parent e1706c13d469a163d811e29d33b86cc5d4bf67e9
parent 503560f0dc42d6185c61be06f8060dfd50d30d69
author Owen Lin <owenlin@google.com> 1258687445 +0800
committer Owen Lin <owenlin@google.com> 1258687445 +0800

resolved conflicts for merge of 503560f0 to eclair-mr2

Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823