tree a4a8bde5c58c850571c470b9a2a8879a161a729f
parent 70e6cff9bcd464fcb22a0d7dc977863ef0952448
parent bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a
author Scott Main <smain@google.com> 1349376618 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349376618 -0700

am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev

* commit 'bc7a20a48c3e8405c8dbbf54dd8f422fa5e19e3a':
  Doc update: TTL change.