| commit | 1fee9957f5081ece6c44ffcf28f6bb7b42abd152 | [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 | 711f481317f9c011bf963b9b135f5ddded47f7df [diff] | |
| parent | b0d359c37204a5c30d37f673e2cd948bc886b304 [diff] |
resolved conflicts for merge of 46603db5 to mnc-dr-dev-plus-aosp Change-Id: I3fb7ff8e9d9313c294620ae0ce63a17766940ec4