tree a57fa68aa088652bd42356a1a3375a187a7dc3ba
parent ee7f46cbd6b67ef4808da705b54b78990b6c6ffa
parent e9b198fd7414771db3df259ce696f0070ea9a153
author Adam Cohen <adamcohen@google.com> 1384539716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384539716 -0800

am e9b198fd: Merge "Change the way view ids are assigned (issue 11627801)" into jb-ub-now-jolly-elf

* commit 'e9b198fd7414771db3df259ce696f0070ea9a153':
  Change the way view ids are assigned (issue 11627801)