tree 4571909fba4d95fab12f9e59d0adb44fcdb4c4c5
parent 8508485871dd22a998db98ea97403126918c5fa8
parent f0e95696c03d9b2dca6a301a767071cf599a2845
author Glenn Kasten <gkasten@google.com> 1306166763 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1306166763 -0700

Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"