| commit | 81fbdade8db4117157ea48602be121e6cf5597dd | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Mar 20 10:27:58 2014 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Thu Mar 20 10:27:58 2014 -0700 |
| tree | 42bc5d04b9a292d6ff41c49eed149e761a5c6fa5 | |
| parent | 6eb2810318262ff36014c52384ed3cdea19bd34e [diff] | |
| parent | 534f3e9438a0e2e97df2d371be834d65720b2eb9 [diff] |
resolved conflicts for merge of 534f3e94 to jb-mr1-dev Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394