am b4a28f24: (-s ours) am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread

Merge commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f'

* commit 'b4a28f24263fbccce4b77b47c2f3ddac63a8a75f':
  Partial fix to bug 2992589: Edit dev admin strings.