| commit | 5951c83dfb38d7a3a01b5f2efc056929d20f647e | [log] [tgz] |
|---|---|---|
| author | Adam Hampson <ahampson@google.com> | Mon Apr 07 21:40:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 07 21:40:00 2014 +0000 |
| tree | 23d63788d3219f15031961137d34b508a3bc0268 | |
| parent | 124af56165e7974748546ac2f243d4db8218f7b6 [diff] | |
| parent | ec571bd203bb543aa1489e0c0a8bb67f5491630e [diff] |
am ec571bd2: (-s ours) am ce802f48: Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev * commit 'ec571bd203bb543aa1489e0c0a8bb67f5491630e': DO NOT MERGE Fix several bad function definitions.