| commit | 3e2d59146df9e9e325dcc65018bb130b03242bbc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue May 01 10:00:22 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue May 01 10:02:02 2012 -0700 |
| tree | 54d3d73e5d71d8ae0e83bfd6516cb6befd7ece97 | |
| parent | 39b58ba2b299e1c97e13535aae9add530d942c7b [diff] | |
| parent | 13c04786ceec6aebe898bca7c62853af2e4e7c09 [diff] |
resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111