| commit | d5827d8ed051a386d7258cf7bbba000ad788b338 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Sep 01 22:42:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 22:42:53 2015 +0000 |
| tree | f1ab2cc180d1234fe9bc9397dd601d58c60f787b | |
| parent | 87257c5bda902a01dfd63c34dc01eba9f214d527 [diff] | |
| parent | 7f04f8f2dc687f89046c6a1d03e6b1d30380344b [diff] |
am af20a7cb: resolved conflicts for merge of cda81d01 to mnc-dr-dev-plus-aosp * commit 'af20a7cb12e5426738f8f068f6e5e46871bae1aa': init: Use classes for parsing and clean up memory allocations