| commit | 76f37e11f40f9c1936b99a33ffecb756699ee26d | [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 | 1e15d5af016a56d14d1f78c837d82c53042f464c [diff] | |
| parent | f7b41d72728f6f211ab43095eb1106d19eeb9b28 [diff] |
Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp