| commit | 2e09793c2e8f50db12430669d74f69f3f2ffd5bc | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Aug 29 18:52:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 29 18:52:27 2014 +0000 |
| tree | 27aa3e6cfea99076ad28ca8d1a391b85c17160ee | |
| parent | 0c918680659a73486f8ee150f87d443e6b436f5e [diff] | |
| parent | 9acdc4a37cff1f7be940bad9995be7b80b169cb9 [diff] |
am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev * commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38': Revert "Content description for padlock icon depending on state"