fat-tire/android_device_bn_encore — pull request #47 by mateor (2014-08-01 17:05:16+00:00)
Title: Fix old old gingerbread merge conflict

Assuming that upstream-gingerbread is the branch you were merging in.
But anything is better than broken, even for gingerbread.