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