diff options
author | Craig Mautner <cmautner@google.com> | 2014-11-05 19:30:19 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2014-11-05 19:30:19 +0000 |
commit | a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c (patch) | |
tree | 92be312eb05514c01c75cdb2574d68d4898bc6ab /tools/aapt | |
parent | 6ad91cbce2ce7eb175086894e4ee27e1ca4d2e75 (diff) | |
parent | 3f36ba647d6bd49363ea9f025a8b1aeac0abeddd (diff) | |
download | frameworks_base-a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c.zip frameworks_base-a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c.tar.gz frameworks_base-a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c.tar.bz2 |
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
automerge: 3f36ba6
* commit '3f36ba647d6bd49363ea9f025a8b1aeac0abeddd':
When keyguard exits use same anim for all windows
Diffstat (limited to 'tools/aapt')
0 files changed, 0 insertions, 0 deletions