Merge "Don't call my-dir" into jb-mr1-dev
authorYing Wang <wangying@google.com>
Mon, 15 Oct 2012 19:04:41 +0000 (12:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Oct 2012 19:04:42 +0000 (12:04 -0700)
commit5403f3c9447193abd30ecc25245a95af03d45d14
treed1457bfc116398776d2056e37bee86868b4564f6
parentf046c50ad3030aed0dd4d0ca6e30d2c30f8458e4
parent6f81a61f44a3d3bc3d0ec6ac7256f770179b7013
Merge "Don't call my-dir" into jb-mr1-dev