OSDN Git Service

am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textur...
authorJohn Hoford <hoford@google.com>
Mon, 5 Nov 2012 23:52:55 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:52:55 +0000 (15:52 -0800)
commitabb367429a626dfe11ccd64c77451dce357a780b
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent3bc158f1a2e7dd9b3a111e0df524a7ee34003bfc
parent27fd152da0547ae8f9e9d503ed544308a16df131
am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit '27fd152da0547ae8f9e9d503ed544308a16df131':