tree 580e04f8497feef50a88a06c2936f6aaccc5bffa
parent 6553101081b1bbf2720414616aaf26aa6d818cf4
parent 477d8f85d7d450cb250342174e37873db223b06b
author Jeff Sharkey <jsharkey@android.com> 1480984612 +0000
committer android-build-merger <android-build-merger@google.com> 1480984612 +0000

Merge changes from topic 'bind' am: 7726057707 am: b20213cf7d
am: 477d8f85d7

Change-Id: Ib16f2550ad2e93795d9881c051cb4f33bfa802a9