| commit | 22d0bdf326de00dd50a388b55540123228cbb025 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Tue Jan 27 11:49:03 2015 -0800 |
| committer | Dan Stoza <stoza@google.com> | Tue Jan 27 11:49:26 2015 -0800 |
| tree | 4323056366a913c79f592a0c83f1bbcfdfddbfef | |
| parent | c7a7b118b501e82d98209ad64ddc18ac4ba404f7 [diff] | |
| parent | 1665c8e1012e535743683d9812bf28c35ee2f10a [diff] |
resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608