diff options
author | Gloria Wang <gwang@google.com> | 2011-01-13 12:38:29 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-13 12:38:29 -0800 |
commit | 6508ec903e7b6596a3b8167e3b18d0b966ea1b8f (patch) | |
tree | bd1100e370bfc582f36ff046b47a9371ad8cbab7 /drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk | |
parent | 641f3f4778ed52c4225ced1eb3ee59cb3ee72a67 (diff) | |
parent | 3ed11317ce695a413d337c60fde222f30306f092 (diff) | |
download | frameworks_av-6508ec903e7b6596a3b8167e3b18d0b966ea1b8f.zip frameworks_av-6508ec903e7b6596a3b8167e3b18d0b966ea1b8f.tar.gz frameworks_av-6508ec903e7b6596a3b8167e3b18d0b966ea1b8f.tar.bz2 |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
Diffstat (limited to 'drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk')
-rw-r--r-- | drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk b/drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk new file mode 100644 index 0000000..9ee7961 --- /dev/null +++ b/drm/libdrmframework/plugins/forward-lock/internal-format/Android.mk @@ -0,0 +1,16 @@ +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +include $(call all-subdir-makefiles) |