commit | dd605322d64414ab8dbb4ac7617c100777e1521d | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Wed Apr 21 11:57:59 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 21 11:57:59 2010 -0700 |
tree | f995f87fc2e71d138f94d0cf4ea061ffdf8970ad | |
parent | 0aae2da0eea0bd3cbf1b16e5e068900366425a92 [diff] | |
parent | 891b4e9d50369f91e714e00b71616b85340ccbfe [diff] |
am 891b4e9d: am beca3af7: cherry-pick from master: 3c26ae869e24e6cd7c63dc44fc3f46221262e15f