| commit | 1c45c0ff5d1cbd49d2d77fa837e1be0724fa77b3 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Jul 14 20:21:52 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 14 20:21:52 2015 +0000 |
| tree | 3659395f6c4f44861da18e354b4b2cdecbef5bea | |
| parent | 6d57c69699f37a27c3cdf0c4d38c822e9ba063ca [diff] | |
| parent | cfda5bb47ac558d3628074904e386178c3fc58e1 [diff] |
Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp