| commit | 09c38adbda5092dc149f338e2905d29bbdc941d5 | [log] [tgz] |
|---|---|---|
| author | Patrick Dubroy <dubroy@google.com> | Fri Sep 24 17:14:43 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 24 17:14:43 2010 -0700 |
| tree | 4617e341efa439dca6187614a3291c0860e99e1c | |
| parent | 9338c66b5c3844cf0c5f2bc5bf60b48496b51149 [diff] | |
| parent | 616300192830b92aecacda6c7d43bddc084b836f [diff] |
am a9cf4494: (-s ours) am 88aa072a: Merge "do not merge - Asset update (pass #3)" into gingerbread Merge commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8' * commit 'a9cf44942b8dbdc5bb00b80725ea15d176ebecc8': do not merge - Asset update (pass #3)