| commit | e15c4e4d63841af70538ae9f1988b53d1bbd15e4 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Jan 11 14:53:52 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 11 14:53:52 2011 -0800 |
| tree | 1bb8c54f12e8faaac7a13d5b82697be6b8f625c8 | |
| parent | a94aeb3175aca5695030b190a3bca0eae5ef3c4d [diff] | |
| parent | 7024a313e44bd19374352e552efd089570605d83 [diff] |
Merge "resolved conflicts for merge of ac8d7926 to honeycomb-plus-aosp" into honeycomb-plus-aosp