| commit | 59224c9537c0a0e96e3ead81084133ecab41c598 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Sep 01 11:25:24 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Sep 01 11:25:24 2015 -0700 |
| tree | 57f621d1443668d41329e35e6ae9f07d78183a4f | |
| parent | 58c906478c599bedb12c4bab3f07d974e6f82c09 [diff] | |
| parent | 46603db57a80fa5a3661514967c25db056efe224 [diff] |
resolved conflicts for merge of 46603db5 to mnc-dr-dev-plus-aosp Change-Id: I3fb7ff8e9d9313c294620ae0ce63a17766940ec4