| commit | 2c0971eeec76f5a4b0aee890f4a05d47020da2b6 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Jan 08 12:34:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 08 12:34:29 2014 +0000 |
| tree | bd9e049cc481cfdf96f6fdf59fc9629f9003ad6a | |
| parent | d9feaf49719d58cfc4fad203bd10e75253024fa9 [diff] | |
| parent | 3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85 [diff] |
am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev * commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85': AArch64: Use long for pointers in services