tree ad74275b0da46e9af42f696d14416cad3e96cb8b
parent 1d83ed6b4e0008539c17fd3fc8680cdfd6b188c8
parent 56150037c7bab8ef4ba3e26a26e498c35e1a612b
author Jean-Baptiste Queru <jbq@google.com> 1286815090 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1286815090 -0700

resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp

Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea