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.
tree: 6948868fce1e6ea9301a77e49d9880f8df2e7449
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE