| commit | 6a2d62c1a972da25de53b1718c165f2b7df85a0e | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Wed Oct 17 14:59:40 2012 -0700 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 17 14:59:40 2012 -0700 |
| tree | 6d653ee5b01f2322e86e47820495ba141b699128 | |
| parent | dbe1be24c9e6fb92a88a38adbd12a56aa5337f74 [diff] | |
| parent | 4cb4f7ce9184de9a221239c28afcf912e7e1ed43 [diff] |
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"