| commit | f089901bb9b2b1f457a03ede5feb94989a640210 | [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 | 61d9c0aafc6a1fc5b017fcb4bfa8476b50d62266 | |
| parent | 442fabda0bf6ce584c002a634a362081bdc0eddf [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