tree ed17c52bd549f314752bd00e131f8318b3f0d76c
parent 08b584acaf3a8a40abcce266fb421e6afccd4f47
parent 29045946c069ef8682625a5d1baa1e3f3124dd33
author Jeff Sharkey <jsharkey@android.com> 1364317992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364317992 +0000

Merge "Remove reference to <root-path>." into jb-mr2-dev