| commit | 640de8c196633d32c50b27eda8ba57bf6a40c304 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 13:23:22 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 13:23:22 2012 -0700 |
| tree | 0b2fd775fb7e82aacc21b3d444eac40f9464ab91 | |
| parent | cfee58b45a11221732c58582988d6bb47fb4de04 [diff] | |
| parent | fd5f0270e58eec02a4b23981d18ad9d74113a5d6 [diff] |
resolved conflicts for merge of fd5f0270 to jb-dev-plus-aosp Change-Id: I6d571215ff13dad8dbd65cf4cb842ddf86fa9642