tree 420cfec948caa0884cd157853e692f7e9804fe75
parent 58acf11fbc36338b0664837de4007ad1f467ad23
parent 33de945451e1380eff2f4c6cd3aa5bb32c0ad368
author Ian Parkinson <ianp@google.com> 1422666564 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666564 +0000

am 33de9454: am 0c2918f4: Use View.generateViewId if available

* commit '33de945451e1380eff2f4c6cd3aa5bb32c0ad368':