OSDN Git Service

am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper...
authorStephen Hines <srhines@google.com>
Thu, 19 Dec 2013 00:36:39 +0000 (16:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 00:36:39 +0000 (16:36 -0800)
commit9fea4caf5bb3f26c3606069218a0ecb860b86e49
treec7671c70391c1ca2badfd14229fea9f6ba3ea45c
parent53ca3018beb1a7a12d12cddfbc433d50ca793cf9
parentad5ee2f40a1b248aea49657e9f7155daac4cf65e
am ad5ee2f4: (-s ours) am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."

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