tree af2b24843139400422d496671d293d0cb3d60bc6
parent 2a36a778d384403cd92b1016ed5c860d3f2c3521
parent 4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a
author repo sync   . build/envsetup.sh   lunch passion-en <clchen@google.com> 1285635105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285635105 -0700

am 4fc3d2f0: DO NOT MERGE

Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE