| commit | 681b21f3e4ef0a63d982eca0e9d1896422bc30ff | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:45:23 2013 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:45:23 2013 -0700 |
| tree | 7d7dd36c3522ac19a9f9f9fa114268aa0de8a3e4 | |
| parent | 56604046c5c46087aa5320d7c6aa6eb49c313637 [diff] | |
| parent | 5d21820a979cac6d9a7426b5a5aed4b65e3cc67b [diff] |
resolved conflicts for merge of 5d21820a to jb-mr2-dev Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31