am 83fdc69e: (-s ours) Merge "Squash commits of the following patches,...
am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
* commit '83fdc69e':
Squash commits of the following patches, cherry-picked from other branch - do not merge.