| commit | 01f644241d638bf5014e02e6404f60bbc3c04b52 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Wed May 13 20:47:46 2015 -0700 |
| committer | Yabin Cui <yabinc@google.com> | Wed May 13 20:47:46 2015 -0700 |
| tree | 243931875283cd649223d1e39095bacd8de8c9c6 | |
| parent | 35169bf573a01e91e944e6808d444aa90e36a3f0 [diff] | |
| parent | 1172163929e26bcd7fdf79ad4c45b836af925119 [diff] |
resolved conflicts for merge of 11721639 to mnc-dev-plus-aosp Change-Id: I141ab123d6dc704240c2722dae7142a97ac99d71