| commit | 33877e15b8bfc50bd874027689a4794aa93b923d | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Sun Oct 07 11:48:49 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Oct 07 11:48:50 2012 -0700 |
| tree | f2315456796e88f0623bf4fed1f2a43a49f3696d | |
| parent | 786d10921b2c525ed22b78ec40ae2554eec85912 [diff] | |
| parent | 5962b12bedc4a1d0354816c1cd6b06ba04f6d807 [diff] |
Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev