OSDN Git Service

am c344ba3a: am cfcdcb84: Merge "Restore deleted string still referenced from a layou...
authorEric Fischer <enf@google.com>
Mon, 24 Jan 2011 22:01:06 +0000 (14:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Jan 2011 22:01:06 +0000 (14:01 -0800)
* commit 'c344ba3aee67c07e6a6740409fc2d3f3615f40bb':
  Restore deleted string still referenced from a layout.


Trivial merge