| commit | 4261ace0139d7bb864d002d7a65be66945ec8878 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri May 25 07:16:04 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri May 25 07:16:04 2012 -0700 |
| tree | 603e06472cc689ac02c3f7b56dded51e3f0b76f6 | |
| parent | 2b9a7982e1af5be28126d0ed95fa75ff195dc87f [diff] | |
| parent | 9f312b815650d4635c90eb1989598ac3adf4d901 [diff] |
resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98