tree 7ad04abf5e82d801e8891b5f8e2ae0ff9c23f715
parent b03dd7509d072d693c995cd489cee5496e1cbe02
parent 399422929b4770011fb41b5e4719ca2605be3a15
author Dean Harding <deanh@google.com> 1513380718 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513380718 +0000

Merge changes from topic "am-bafdccc3-a61e-4726-bd2a-1b6da2ab4147"

* changes:
  [automerger] Mark getRootAdapter() @deprecated. am: 3ad4bcf5b2
  Mark getRootAdapter() @deprecated.