commit | a72c1e8e4de4efbce007bec89a952e78c751e0d6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue May 18 09:26:27 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 09:26:27 2010 -0700 |
tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 | |
parent | 372b12e2f4ff1501e12c6a85bc12894daea96548 [diff] | |
parent | b47eaa315d626e92ac58ff74efddd53e64b7451d [diff] |
am 40090708: am 4547e528: merge from open-source master