| commit | 2fa5ebd3414347a69762f435e30d9e355547a702 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Fri Sep 23 16:49:37 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 23 16:49:37 2011 -0700 |
| tree | c678cfaa17ead74e867bd0299d2c4d68500bd435 | |
| parent | 8985ff3e30a4eb3fe8610e2f9271dd600b883e69 [diff] | |
| parent | ef33cfcef8082b20df0263101c4cef7d76e4102b [diff] |
am ef33cfce: (-s ours) Merge b927e75 from master. do not merge. * commit 'ef33cfcef8082b20df0263101c4cef7d76e4102b': Merge b927e75 from master. do not merge.