| commit | 07f6904f97f1b5de82a7c76ef828fde65559706b | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Fri May 03 15:30:07 2013 -0700 |
| committer | Raphael Moll <raphael@google.com> | Fri May 03 15:35:31 2013 -0700 |
| tree | 4f71e9fbc853c2e7d02df78cf5b4b092537e18c7 | |
| parent | dba01032b2766567d676a6b9b7ebb044d897a0ef [diff] | |
| parent | 80f171f82abd9589bcea5f4f1ada0aa013538c69 [diff] |
resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp Change-Id: I5f5b53b63af86ccd421e280f847420c714bf924f