am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
authorYing Wang <wangying@google.com>
Mon, 15 Oct 2012 19:10:05 +0000 (12:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 19:10:05 +0000 (12:10 -0700)
commit175891efcec34f752573a2779b0890ed159bad98
treed1457bfc116398776d2056e37bee86868b4564f6
parentc95c1af0b8e910f638919cb3a5c1236fa17fa8dd
parent5403f3c9447193abd30ecc25245a95af03d45d14
am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev

* commit '5403f3c9447193abd30ecc25245a95af03d45d14':
  Don't call my-dir