diff options
author | Daniel Sandler <dsandler@android.com> | 2013-11-13 12:14:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 12:14:25 -0800 |
commit | 086034117d9214de6339a29b93412276eb00afea (patch) | |
tree | 2e115c36a823f0e7233bf60b4ad143175ef7b358 /services/java/com/android/server | |
parent | 076dcaf11b4fd3deef52bddfc2b2e7727f6364a1 (diff) | |
parent | 2f4fb5eef5ac5c08f7d30c75b56990ce5a729509 (diff) | |
download | frameworks_base-086034117d9214de6339a29b93412276eb00afea.zip frameworks_base-086034117d9214de6339a29b93412276eb00afea.tar.gz frameworks_base-086034117d9214de6339a29b93412276eb00afea.tar.bz2 |
am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
Bespoke, handcrafted, artisanal assist affordance assets.
Diffstat (limited to 'services/java/com/android/server')
0 files changed, 0 insertions, 0 deletions