| commit | 15e991bdf8870c2c9820c2d98e0d30dae2e05a25 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Thu Oct 08 10:02:30 2015 -0700 |
| committer | Wei Jia <wjia@google.com> | Thu Oct 08 10:02:30 2015 -0700 |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 | |
| parent | 39f64a1e4903624bd6395aa2a1c6875a10ed489d [diff] | |
| parent | 0b09da7a98d5f55674dba7b380e1b8d262f709b0 [diff] |
resolved conflicts for 0b09da7a to lmp-mr1-dev Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487