tree c5e43b158779f49d8b5d108274e707ce4ca0a5c3
parent 700889f504ef134ab307d95b6bfbbb426ea730e3
parent 35e79e32808456a7f5f21126ed2fa7badf8dc0bc
author Jean-Baptiste Queru <jbq@google.com> 1286833450 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1286833450 -0700

resolved conflicts for merge of 35e79e32 to gingerbread-plus-aosp

Change-Id: I039355b9d5852436c8352efc5a85590e5f2bc080