tree 54efe47d5cf24b28abb0625f1eff11ae97f323a7
parent 687ec9b5e143aa92de008efcaa7b5750eeab87ef
parent c8d7d2d6b99f405ea3fcada0d2407baee23873f6
author Rom Lemarchand <romlem@google.com> 1388784954 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388784954 +0000

am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

* commit 'c8d7d2d6b99f405ea3fcada0d2407baee23873f6':
  move sync headers from include to libsync