OSDN Git Service

am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub...
authorJohn Hoford <hoford@google.com>
Thu, 11 Oct 2012 17:13:21 +0000 (10:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 17:13:21 +0000 (10:13 -0700)
commit110651236a1ce10c360de0b0ed761514281d61d8
treeeedffb22be8b67cfa458e0ee9af490174e149321
parente8124973c4e78652df05a21a1ce69e8624d45390
parent7f34a6a5f21209c22584680f280723584e2c28e7
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches

* commit '7f34a6a5f21209c22584680f280723584e2c28e7':
  Fix application of FX to not wipe out borders etc.