OSDN Git Service

am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
authorJohn Hoford <hoford@google.com>
Wed, 24 Oct 2012 18:17:10 +0000 (11:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Oct 2012 18:17:10 +0000 (11:17 -0700)
* commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033':
  limited the size of textures to 2048


Trivial merge