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)

Trivial merge