tree c028bfe537607823c37e2ffc8c713c73059d3130
parent a42854b9b44a188f76ffa41f5e2fa0f54a39b2f6
parent 3d78b80ecdfeec7704b2aa82ce39823fa903ea61
author Ian Parkinson <ianp@google.com> 1445300944 +0000
committer android-build-merger <android-build-merger@google.com> 1445300944 +0000

am 0c2918f4: Use View.generateViewId if available
am: 3d78b80ecd

* commit '3d78b80ecdfeec7704b2aa82ce39823fa903ea61':