commit | 04fb769a50c3e5b3bcc97b22c24863d31c63df61 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 04 11:06:19 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 11:06:19 2009 -0700 |
tree | b3eb7eb4367eeb76eec607956a2666e9cf4ae446 | |
parent | 30b64002e46bf8d70784fad44d24d84110772930 [diff] | |
parent | a1e794f5b96ac2b877e38f205a8e4922bbecad75 [diff] |
am a1e794f5: merge from open-source master Merge commit 'a1e794f5b96ac2b877e38f205a8e4922bbecad75' * commit 'a1e794f5b96ac2b877e38f205a8e4922bbecad75':