tree cfc6d9831ac6bb042fbc92a07d3123d3571742da
parent 398e6353cc22c821e5c8cbba013953517ac30c93
parent 79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697
author Rom Lemarchand <romlem@google.com> 1388785341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388785341 +0000

am 79b6b7f0: am 1892fe66: am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

* commit '79b6b7f0fdb14fcd8c336ed8f1c0a5b481bb8697':
  move sync headers from include to libsync