Merge "Updated permission bullet" into honeycomb