| commit | 2550355ceb2bd5e2815f333067e0ccff11fbf275 | [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 | 867ea48a8afcca08cf4ec7bfde6b3ee8780be1e2 [diff] | |
| parent | d410a9b323858cf773694a6f61d8bb239a47caaf [diff] |
resolved conflicts for merge of d410a9b3 to mnc-dev-plus-aosp Change-Id: I2e8e6c9a2024e0a753d3912111ccd1c2bfbfef10