tree c1216aba396438c5bf76a75408960aef00b68555
parent 05c4888988880a2dd74efc90ea72d9a6b2501455
parent 8024e81e2acd5252edd7b40df9f884df99997db5
author Jean-Baptiste Queru <jbq@google.com> 1282085293 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282085293 -0700

Merge "Remove spurious file"