| commit | 8565363126ed2c39444eb42f9879d0a88ed7905b | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sun Oct 07 11:55:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 07 11:55:58 2012 -0700 |
| tree | 390d4087eec6b8077f950342a3b2557b409efb9d | |
| parent | 02ff76c5d93b30e028edde473f3fb59994102b89 [diff] | |
| parent | 337aa27a6307e0f40705ee676551dda4bf6cb894 [diff] |
am 337aa27a: am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev * commit '337aa27a6307e0f40705ee676551dda4bf6cb894': Adds showWhenLocked attribute to Activities.