tree 915d4a48d0825eb5d43b63526e4af424346c140d
parent 6a10d397f311f7816d29e9879eb1c020b8863821
parent 4110368b935e51ebd75fff88492bbef451837383
author Jeff Brown <jeffbrown@google.com> 1285818708 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1285954931 -0700

resolved conflicts for merge of 4110368b to gingerbread-plus-aosp

Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137