commit | b1f1d0ede6b54250970525646f25f4c74dcff02c | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Fri Jan 14 16:27:48 2011 -0800 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 14 16:27:48 2011 -0800 |
tree | b7af549de036a18dfd20882c6564b752daf1288b | |
parent | 824bb889ff6cbaae59d067c850956e4e3a46e839 [diff] | |
parent | 2ee9a92f6a941f010d8f85cd8baee708cd6f2e16 [diff] |
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread