OSDN Git Service

Fix conflict with other build fix
authorMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 20:17:33 +0000 (13:17 -0700)
committerMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 20:17:33 +0000 (13:17 -0700)
commitf38cb998d6d35ce31a7aa446073e8488305812c2
tree73d663620adf7d80e407446bc5ea64afa3adce5a
parentd43a8f94375e899a4b2a544552875c1b0d8b48f4
Fix conflict with other build fix

Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
tests/src/com/android/gallery3d/ui/GLRootStub.java