tree c75d197328351a1ff20dc636740ff0f26b2eb3a9
parent 5af04b6bc91130e6ec3a38e2590571fcf13bccfa
parent bc31b328f70866136a286b3a2b84de4eeb15c687
author Ian Parkinson <ianp@google.com> 1422669746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669746 +0000

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

* commit 'bc31b328f70866136a286b3a2b84de4eeb15c687':