commit | 803c5eb17d083417037942f4e84296401701f767 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 16 09:06:45 2014 -0700 |
committer | Geoff Mendal <mendal@google.com> | Mon Jun 16 09:06:45 2014 -0700 |
tree | b022409f6587de2237f9496bf86dcc2886b4326a | |
parent | 5d140e4b1b1d43c742a7d67dd5f9d394c846945f [diff] | |
parent | 587e9e183117609e21653ee53dfe80c22817d89d [diff] |
Merge commit 'fd7ef123c01718e44c13ed638b86a7483ae2d9c9' Conflicts: packages/SystemUI/res/values/dimens.xml