commit | 91c81750f61fbb5b17112003fc231d16c25ee257 | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Tue Apr 12 13:14:10 2011 -0700 |
committer | Ying Wang <wangying@google.com> | Tue Apr 12 13:14:10 2011 -0700 |
tree | 1bf431e1fe748d83e1a7bb9c60ae9db7d8609d6b | |
parent | 5d587a470f83afe07a9cb97ab0fdb555efee751d [diff] | |
parent | 4d9a8556ffcff525568f49fd22549991b6ec77cd [diff] |
resolved conflicts for merge of 4d9a8556 to honeycomb-plus-aosp Change-Id: I3914339049e3d302f8542d8ea305905eec480bbb