| commit | 337aa27a6307e0f40705ee676551dda4bf6cb894 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sun Oct 07 11:53:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 07 11:53:43 2012 -0700 |
| tree | 9d4721514cc14c709cae12073eb1ea1300365682 | |
| parent | fee7ddedc99e377002aa6a88c3e287cb6e6c405d [diff] | |
| parent | 8ee7ac22e6aec5df5405a3e2130d593c50bc39b2 [diff] |
am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev * commit '8ee7ac22e6aec5df5405a3e2130d593c50bc39b2': Adds showWhenLocked attribute to Activities.