| commit | dfb9d42f78e0feb1168fc88c526f7401284a9b5a | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Oct 17 15:07:05 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 17 15:07:05 2012 -0700 |
| tree | ce360aa36fe2691d8ffee36095732c92427ee662 | |
| parent | 98d172313eb675b2a1960059527518a8609b2fbe [diff] | |
| parent | 6a2d62c1a972da25de53b1718c165f2b7df85a0e [diff] |
am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the" * commit '6a2d62c1a972da25de53b1718c165f2b7df85a0e': Manually merge change #111620 from tc3 to mainline, to keep the