OSDN Git Service

am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO...
authorStephen Hines <srhines@google.com>
Thu, 19 Dec 2013 00:44:27 +0000 (00:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 00:44:27 +0000 (00:44 +0000)
commit16c75d3a5896006bddcf4b3a39167efc1972540e
tree81d6519f714ace70b8c2d38fcce1f1d32f00061d
parentac1432443d11deb3dd5aa3ee2697312becfe75ae
parenta341c97bf7546243fa312d98de59394442142d38
am a341c97b: am 9fea4caf: am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."

* commit 'a341c97bf7546243fa312d98de59394442142d38':
  DO NOT MERGE - Fix improper declaration/use of pointer.