| commit | 2b3f9aa748cf4477077e0785a01a4de753ab97e9 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Dec 19 00:47:30 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 19 00:47:30 2013 +0000 |
| tree | ded0f0ff535d47b3c9b0a296e55c29518c28a92a | |
| parent | 2df85bbb110b48dd6e7718319482c2ea2e437995 [diff] | |
| parent | 16c75d3a5896006bddcf4b3a39167efc1972540e [diff] |
am 16c75d3a: am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." * commit '16c75d3a5896006bddcf4b3a39167efc1972540e': DO NOT MERGE - Fix improper declaration/use of pointer.