| commit | 5904c1fca2398f7fce591c6d3b6464a63b484063 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 12 20:16:40 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue May 12 20:16:40 2015 -0700 |
| tree | 0efa2478b2b9f29e3ff368902823c8b177ce8ab3 | |
| parent | 86255c98d9c8989e969f2a044e57cea66f6955da [diff] | |
| parent | 5c6ed9821aec80c295ff5e326db8d9080686887b [diff] |
resolved conflicts for merge of d410a9b3 to mnc-dev-plus-aosp Change-Id: I2e8e6c9a2024e0a753d3912111ccd1c2bfbfef10