| commit | f694d378955ddac3ee2651080bfa00c5ae39dddc | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Mon Sep 21 13:00:04 2015 -0700 |
| committer | Zach Jang <zachjang@google.com> | Mon Sep 21 13:00:04 2015 -0700 |
| tree | 25717e681fb0619fe879112463952187667e20f4 | |
| parent | 17aa06f6fe0c10cb3bb84a11dfc78a88a4155adc [diff] | |
| parent | b161297d4be7de24f832a4aa7329a7278a41bec5 [diff] |
resolved conflicts for b161297d to lmp-mr1-ub-dev Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e