tree 09e0113471ea02f90f68dc0f1a3b62355d6e626a
parent 5b62e60a38fab22c0fd0174d8081e700a5d6522f
parent 772605770712552536fff5db371cb79d13b21896
author Jeff Sharkey <jsharkey@android.com> 1480983857 +0000
committer android-build-merger <android-build-merger@google.com> 1480983857 +0000

Merge changes from topic 'bind'
am: 7726057707

Change-Id: I6e0198eceaa85c97bf3b72791e4e5e1df5086091