am 79c6a8d2: am ca7466d2: Merge "Make bionic\'s dependency on the tzdata explicit."

* commit '79c6a8d2b163e40eb6f19bbf8f59eb85fb7996e6':
  Make bionic's dependency on the tzdata explicit.