diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-21 23:58:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 23:58:29 +0000 |
| commit | 6d118e0241cc60f010adee0b4ba94fc1894acff8 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /services/devicepolicy/java | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
| parent | 90102e10093f7bb658fb7dd6c30a1efd5380c6d1 (diff) | |
| download | frameworks_base-6d118e0241cc60f010adee0b4ba94fc1894acff8.zip frameworks_base-6d118e0241cc60f010adee0b4ba94fc1894acff8.tar.gz frameworks_base-6d118e0241cc60f010adee0b4ba94fc1894acff8.tar.bz2 | |
am 90102e10: (-s ours) am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev
* commit '90102e10093f7bb658fb7dd6c30a1efd5380c6d1':
Revert "Add a way to override Xfermode DO NOT MERGE"
Diffstat (limited to 'services/devicepolicy/java')
0 files changed, 0 insertions, 0 deletions