| commit | c4251ce466a6f9f494d627fb2928c97363be53b3 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Wed Oct 26 15:12:17 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 26 15:12:17 2011 +0000 |
| tree | ddfecdf2d79ba4445f72699553c659cabe4f31e4 | |
| parent | bc418dcb7346f39b3e5870e7d70ef1d43aa885bb [diff] | |
| parent | 7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611 [diff] |
am 7f2b28c8: (-s ours) merge ics-mr0 * commit '7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611':