tree 3df13b324209e6ab022e8508522255c975507533
parent a05c7c29200acc0dda642e4c7d1f79a72d7a1b34
parent d567127f0a3f67183011cc7999717eb8ae74e8a7
author Gilles Debunne <debunne@google.com> 1300132621 -0700
committer Gilles Debunne <debunne@google.com> 1300132621 -0700

resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da