tree 862fc4cae41e95727a2df0db36c65faaba3de900
parent b2ee9201be583b17ddbf0eaa69a37545f992b565
parent 37bee62aefb5ac10716054edf482fd37078f1427
author Android (Google) Code Review <android-gerrit@google.com> 1244646629 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244646629 -0700

Merge change 3514 into donut

* changes:
  core of edify, an eventual replacement for amend