am 175891ef: am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev
authorYing Wang <wangying@google.com>
Mon, 15 Oct 2012 19:11:48 +0000 (12:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 19:11:48 +0000 (12:11 -0700)
commit31d57456d77f943ece82722fa8e5fff45588b576
tree790bf12baaac01822f140593dfe6a0e6b2aeb01e
parent4bb6e22b3baab1f90a5021aa3ecd1eec3a0fb849
parent175891efcec34f752573a2779b0890ed159bad98
am 175891ef: am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev

* commit '175891efcec34f752573a2779b0890ed159bad98':
  Don't call my-dir