tree afc6505713cbed988f98db8f4f126d6e2d67a8c1
parent 1a2c6089f81488a13de929028ea4627c6916a9c5
parent 6ba052b4847d85831c38c9b8e2942cef4987e55b
author Jeff Brown <jeffbrown@google.com> 1287423098 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287423098 -0700

am 6ba052b4: (-s ours) am c1a564b1: Merge "Add support for secure system overlays.  (DO NOT MERGE)" into gingerbread

Merge commit '6ba052b4847d85831c38c9b8e2942cef4987e55b'

* commit '6ba052b4847d85831c38c9b8e2942cef4987e55b':
  Add support for secure system overlays.  (DO NOT MERGE)