tree fd1ba7150071cb166993da1decdd3f80549c7907
parent 89cfdf376bfe7b1e994856b49c887d9652c928a6
parent c7f40c93944d3b2a81f5ea5164e551e7d0f53dfd
author Ian Parkinson <ianp@google.com> 1445310055 +0000
committer android-build-merger <android-build-merger@google.com> 1445310055 +0000

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

* commit 'c7f40c93944d3b2a81f5ea5164e551e7d0f53dfd':