| commit | b2235d5db74e26d6f3695eac672096d2cf430ade | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Mar 07 19:41:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 19:41:27 2014 +0000 |
| tree | 35147025d400b188a143c999caee47914c564cbc | |
| parent | cde786835676f14c4d24cc4769a2de7ead853c5c [diff] | |
| parent | fca204a4b8771b800383c91465a48eb2cd8b3ba2 [diff] |
am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." * commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2': Fix several bad function definitions.