| commit | e0d9925a3691682b3f0e91fb2bd8a8a8163e6e20 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Sep 29 14:37:07 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 29 14:37:07 2011 -0700 |
| tree | d7d39a38daf099e7d47a905fb8b9b7fa5a76c33e | |
| parent | b45488d51f5012b4ccdf30566c0fed83787dede5 [diff] | |
| parent | 0f2c305640a83b480691dc9002eb2ff5c808dff2 [diff] |
am 0f2c3056: (-s ours) Cherrypick d7b602 from master. do not merge. * commit '0f2c305640a83b480691dc9002eb2ff5c808dff2': Cherrypick d7b602 from master. do not merge.