| commit | 99f836b742229d99a3af0c0ec2a519aa07eab4ac | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Mar 31 14:30:48 2015 -0700 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Mar 31 14:37:30 2015 -0700 |
| tree | 08a14e13432b32685d6f697913e00be2073f1ac8 | |
| parent | efe49c4bf69fba15aeffdd28ee5a838175e95afa [diff] | |
| parent | a36ed7c1e95b62676f47648ddc5949638ea2ba92 [diff] |
resolved conflicts for merge of a36ed7c1 to lmp-mr1-dev Change-Id: I3c793571d6b8d9f28cedc1759af58cc7bb5de895