| commit | 0771ba9cf23f19c9662407fdd6a12845db225565 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:57:29 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:57:29 2010 -0800 |
| tree | 1dc31e39fbe875c4e05888b219aad32f9958e1ff | |
| parent | 61ef50bb775712606728bb27be38157b467218d5 [diff] | |
| parent | b869c594465d29e96fb841b48c638ddee232bbd7 [diff] |
am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7' * commit 'b869c594465d29e96fb841b48c638ddee232bbd7': DO NOT MERGE