tree 4f514a521fc36ebbabeddee462c117e615c59202
parent 301a617698e74bb413df52f93ea7908a33423250
parent 2649c58b460c2cd841173a8db513a54180422330
author Alan Viverette <alanv@google.com> 1418664691 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418664691 +0000

am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev

* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener