commit | 0636b2534876fd1b6f43791f5b4aefc236cb466b | [log] [tgz] |
---|---|---|
author | Chris Warrington <cmw@google.com> | Thu Aug 27 12:17:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:17:43 2015 +0000 |
tree | 55f14758d30a9c1e7fa3015c665822bb1363e950 | |
parent | 4f5ab72ae48153fe6f5f2b986d8342369b0ec7db [diff] | |
parent | ff189baaf9d35656d3474f4c00a2ae9d0b84e560 [diff] |
am ff189baa: (-s ours) am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev automerge: ea12935 automerge: eccf248 * commit 'ff189baaf9d35656d3474f4c00a2ae9d0b84e560':