tree 2c41df792b6ff4101aa511d384e6f4ec2b3ec427
parent 0fed1c87a58eb12ad1147962fb87793981ce3de9
parent e227057e5d8bd669bda98d9f2c2ec07693295bef
author The Android Open Source Project <initial-contribution@android.com> 1291224088 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291224088 -0800

am feddf84a: merge snapshot

* commit 'feddf84a51d280dba38b72a28266d6d6e70ef60a':
  snapshot