Ignore b04e3940 from gingerbread-plus-aosp - already in master

Change-Id: Iad2179aa6cf6214ba32239774846bad676f6b976