| commit | 258276dcfac159a3ad9f13e99d24f0f0287f30bc | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Tue Sep 16 21:25:24 2014 -0700 |
| committer | Nancy Chen <nancychen@google.com> | Tue Sep 16 21:26:51 2014 -0700 |
| tree | afa0b5d63f18e7f118a28d32800519bdaf0a8fba | |
| parent | ad5ed629fd2045719f19bdc450cc26ba4c1c66b8 [diff] | |
| parent | 0a0744d33b4bfd90e34f3f97abd327537c406a27 [diff] |
resolved conflicts for merge of 0a0744d3 to lmp-ub-dev Bug: 17510811 Change-Id: I411b34525590017e9d02aa16eee25bf9711e7518