| commit | a341c97bf7546243fa312d98de59394442142d38 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Dec 19 00:40:35 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 19 00:40:35 2013 +0000 |
| tree | 9a44ea6b7824609363ae04ec9de7c16370fdba5d | |
| parent | f5570908a5acc1f68128c974abcfb0117a44589d [diff] | |
| parent | 9fea4caf5bb3f26c3606069218a0ecb860b86e49 [diff] |
am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer." * commit '9fea4caf5bb3f26c3606069218a0ecb860b86e49': DO NOT MERGE - Fix improper declaration/use of pointer.