| commit | 44ddca42f472b839dd0352a3582fdb57684d907e | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Oct 17 15:09:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 17 15:09:25 2012 -0700 |
| tree | e495e5cccd9d799422c0472e03b86a9e51be697c | |
| parent | 78914e06f83bab85a513856b46684314cba366a2 [diff] | |
| parent | dfb9d42f78e0feb1168fc88c526f7401284a9b5a [diff] |
am dfb9d42f: am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the" * commit 'dfb9d42f78e0feb1168fc88c526f7401284a9b5a': Manually merge change #111620 from tc3 to mainline, to keep the