| commit | 47f4590890e95e16b2fa3ff31f4230c4efb1fa6b | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sun Oct 10 14:00:43 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 10 14:00:43 2010 -0700 |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 | |
| parent | f938068c90a4f684986e145cd20f294882f22c57 [diff] | |
| parent | f7f27a15b3ef8214fb77611ae3eeeaf53125315e [diff] |
Merge "resolved conflicts for merge of bd38710b to master"