tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent a9a043f08f6a98518696338118ccb418ebb156bc
parent d7657922f8112d203d28ee5dc0d418316100ddd2
author Ian Parkinson <ianp@google.com> 1445310384 +0000
committer android-build-merger <android-build-merger@google.com> 1445310384 +0000

am 0c2918f4: Use View.generateViewId if available am: 3d78b80ecd am: 8374915b27 am: ceb823f9ec am: 35a3ca532b am: 0317b768f6 am: 1f177aee96 am: 0af053b667 am: c7f40c9394
am: d7657922f8

* commit 'd7657922f8112d203d28ee5dc0d418316100ddd2':