OSDN Git Service

am a92c04f2: (-s ours) DO NOT MERGE Fix compilation issue
authorMatthew Xie <mattx@google.com>
Wed, 2 Jul 2014 07:36:33 +0000 (07:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Jul 2014 07:36:33 +0000 (07:36 +0000)
commitaf07802a44bef913effadd5617a995e5c15e1059
tree7521d976fc8c2a73329d8879bf1b30e7e911fa8a
parente3eecc1515a278520665bbf87a91837a5bebec46
parenta92c04f2dbd7f88853d6380d66c1f4d200674f97
am a92c04f2: (-s ours) DO NOT MERGE Fix compilation issue

* commit 'a92c04f2dbd7f88853d6380d66c1f4d200674f97':
  DO NOT MERGE Fix compilation issue