| commit | 635d4ca2225abdf05ed8da639ea87c01f59bf054 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 24 20:12:02 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 24 20:12:02 2015 -0700 |
| tree | e9ff9d44e258888e99790edb248a4543479aeead | |
| parent | ba85ec85d0a6eeacac7c9b6d35d796f3217c1a24 [diff] | |
| parent | f9c65dea726cacea7845d95afc4a9b1d3708f9b2 [diff] |
resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp Change-Id: I5041d5ac2f377adfeaa6138db47359f1a47fffc7