tree ead55ad1b27e5b4322ea62d778ca1c53e8f421f4
parent 24a9e98a834385ac358dc092d2eef069069a559c
parent dd897d46523f0c9741415e7ab09de09e5f446579
author Android Build Merger (Role) <android-build-merger@google.com> 1495848954 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1495848958 +0000

Merge "Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev am: 9c4b6d3bff" into oc-dev-plus-aosp