| commit | 89b3ecc7b38f9e0601c36176834a66af0f825193 | [log] [tgz] |
|---|---|---|
| author | Wale Ogunwale <ogunwale@google.com> | Wed Nov 12 12:46:45 2014 -0800 |
| committer | Wale Ogunwale <ogunwale@google.com> | Wed Nov 12 12:46:45 2014 -0800 |
| tree | ea6df391e2eeed6adf0f4115473f93614b6c8c3b | |
| parent | e9e96e7f0e372459372b31b138124d0760ed2689 [diff] | |
| parent | 2755644d32fc87dd29612302edc7ebf4cba31ff6 [diff] |
resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d