| commit | d645ddc0ae78168368b7ec6a6b339ed6ec77e24a | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@google.com> | Wed Sep 28 16:45:33 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 28 16:45:33 2011 -0700 |
| tree | 5201a5e53eb6b3bd52dde294e69c7249f9a5020d | |
| parent | 115cbf063b4df1bb6d7bd7f69c9ae231d6361d54 [diff] | |
| parent | 17210f0b8de483ba0d44d8187fc6c69f73fbdd7d [diff] |
am 17210f0b: (-s ours) Cherrypick 944311 from master. do not merge. * commit '17210f0b8de483ba0d44d8187fc6c69f73fbdd7d': Cherrypick 944311 from master. do not merge.