tree 8c21c9549667afbc32ff9841e28c055f9259b1cc
parent df08c2f03e7cf7be7002d34efe8e4e8d24e406de
parent e3cfd35bf4d430e56456818bf8c84ef4c2c0dfde
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