| commit | a950eb18792da6962fcefa69b12ffc3f9d8cdca8 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Dec 05 18:25:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 18:25:17 2014 +0000 |
| tree | 07457eb36c996afdac69e4c65b64db35c614dcdc | |
| parent | fb81193d444347e6aa232766687d25057246799a [diff] | |
| parent | 6efc505bd8dbddf96f9f8f1984196c511d48b3b0 [diff] |
am 6efc505b: am 09b9193d: Merge "Fix -Werror on 64-bit builds" * commit '6efc505bd8dbddf96f9f8f1984196c511d48b3b0': Fix -Werror on 64-bit builds