| commit | b08914475e4e94d8390996d54d87f905979238d8 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue May 03 16:14:58 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 16:14:58 2011 -0700 |
| tree | 2396d55f8e1a2e9bee1f67af09c36d7bf70a583f | |
| parent | d0bc13e161401f92c73fa6ba0d4e525b30dac4c8 [diff] | |
| parent | 8dbc643bbc65d89c1fac69f09d02d8ff12b008fb [diff] |
am 8dbc643b: (-s ours) am 60d10ec9: (-s ours) Merge from gingerbread - do not merge * commit '8dbc643bbc65d89c1fac69f09d02d8ff12b008fb':