tree 42fb1cdb0cd2327154a848afd35c0db5c8491eea
parent 573fd7b68b789e5a4d0b3da3b499e5555e0faee0
parent 9b9c2114bd7d02200ce43cb9ec513473079dfad9
author Android (Google) Code Review <android-gerrit@google.com> 1244646752 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1244646752 -0700

am 9b9c2114: Merge change 3514 into donut

Merge commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9'

* commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9':
  core of edify, an eventual replacement for amend