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