commit | da5917ec359eeee04f83672958c10891afe01f16 | [log] [tgz] |
---|---|---|
author | Roy West <rwest@google.com> | Wed Sep 29 22:12:19 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 29 22:12:19 2010 -0700 |
tree | 4f01a68575cf7becbd9e1a4160a458a3140f9f35 | |
parent | a1ffc6f1ed54da69003d2b680c05ded52e0827c2 [diff] | |
parent | b4a28f24263fbccce4b77b47c2f3ddac63a8a75f [diff] |
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.