commit | 7868d748addd3cd6e3547d545d0ee16317859892 | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Wed Jan 23 15:31:15 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 23 15:31:15 2013 -0800 |
tree | 1214241d8cb15954073dfc5641f6be6eb8f086bb | |
parent | d8ba6cc9217e2e042106870e9d2e70cfd80426d6 [diff] | |
parent | ae041ce83d32c7b34d7c513e077165764e97871d [diff] |
am ae041ce8: am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev # Via Android Git Automerger (3) and others * commit 'ae041ce83d32c7b34d7c513e077165764e97871d': Prevent simultaneous interaction with action bar and content