| commit | 12a4df2b66fccbc1e4293e8f56217e1064b2e8ea | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Oct 01 14:31:01 2014 -0700 |
| committer | Ihab Awad <ihab@google.com> | Wed Oct 01 14:31:01 2014 -0700 |
| tree | 22c74f18cddcc93f92a6961c5527226a622bfbed | |
| parent | 3867e4d0c08ad74ee16dfde70e81c77f09e0e0ff [diff] | |
| parent | ead63f02006039655e3f2733ba27e19d158da432 [diff] |
resolved conflicts for merge of ead63f02 to lmp-mr1-dev Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b