tree 8fbd90b9736a36a16ab30d2d7776e41b7efab679
parent 477e963276a1fb3759cbf40fc4ea1039b0d22057
parent 5372220a1a12a715ca1242dcc3f4b11b89a8387a
author Jean-Baptiste Queru <jbq@google.com> 1305215579 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305215579 -0700

am 5372220a: Merge "Remove simulator from the lunch menu"

* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu