| commit | 437d698257ab407790fed3e293fe6488fd0c5a70 | [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 | 9b09bf4aedd49f8854b3d614547cb07a4986c335 [diff] | |
| parent | 038b76c23e8b20b8fc620677d21e90bf430fef84 [diff] |
resolved conflicts for merge of 038b76c2 to mnc-dr-dev-plus-aosp Change-Id: I5041d5ac2f377adfeaa6138db47359f1a47fffc7