tree 34441a6b366125ba752a84820d31b3895bf5ff0b
parent ddee9ca04e6e6bef1d054115455396bb413b982a
parent 208cec02eab6cf2cbe2fdab6e14bb21119883297
author Katherine Kuan <katherinekuan@google.com> 1306267044 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306267044 -0700

am 208cec02: (-s ours) am 256847d2: DO NOT MERGE Reduce edge fade

* commit '208cec02eab6cf2cbe2fdab6e14bb21119883297':
  DO NOT MERGE Reduce edge fade