tree 0024deec53b34d290c53e25052e119da9401b800
parent 9e78f550b7e6a1bed2a300f476fa821a727b0b3c
parent b9e9f91c2a2c12ccfc06cbc2a01d6f58b0cecda3
author Elliott Hughes <enh@google.com> 1436464656 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436464656 +0000

am 9df25446: am 9bad590e: Merge "Binder on Windows? Unlikely."

* commit '9df254460b2dfd3db1132affc9489d0be01def23':
  Binder on Windows? Unlikely.