commit | 4f5ab72ae48153fe6f5f2b986d8342369b0ec7db | [log] [tgz] |
---|---|---|
author | Joe Baker-Malone <jbakermalone@google.com> | Thu Aug 27 12:17:42 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:42 2015 +0000 |
tree | 55f14758d30a9c1e7fa3015c665822bb1363e950 | |
parent | 46c3b1a1de6883489dc90abee60b3a805a357b0d [diff] | |
parent | 24dd4cd7d7c527651d1632c2eb08b433bfa34c45 [diff] |
am 24dd4cd7: (-s ours) am b0344cf0: Merge "Supporting path specified by build_tools.sh" into studio-1.4-dev automerge: 6664a90 automerge: 5ffab62 * commit '24dd4cd7d7c527651d1632c2eb08b433bfa34c45':