tree 1bc7f4237455da2997bd66f2329d2661dbdb552a
parent 6214ad9f5f02d21026a1c9e132f9e95a825359fc
parent afa8043cf5e6acd4670c3cce89a46ba702aa5e83
author Android Build Merger (Role) <android-build-merger@google.com> 1506968848 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506968848 +0000

Merge "Merge "Merge "Don't crash onServiceDisconnected..." into oc-mr1-dev am: dab9eff899" into oc-mr1-dev-plus-aosp am: bb268b9fd6"