| commit | 9d1bc9f252edae3a31decf5c18e971c6ab424b26 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Oct 13 12:29:36 2015 -0700 |
| committer | Andy Hung <hunga@google.com> | Tue Oct 13 12:50:00 2015 -0700 |
| tree | ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 | |
| parent | 6f2353270fee99134abe61203e5c3330ce04a17b [diff] | |
| parent | 4beea2778db2b9c236761676d105e38d60c675a6 [diff] |
resolved conflicts for 4beea277 to lmp-mr1-dev skip -s ours Change-Id: Iae11c820854c04f47a7d0198a780cd7a768e5cb6