| commit | 8e56b625bb4b56813769db8383766ac92da4ecc8 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 12:14:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:14:10 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | b963c3abc28e0b47dd75c4fd15257356ca192669 [diff] | |
| parent | 91ed3193874800a24f58af4e061cc3b38f2e43f4 [diff] |
am 91ed3193: (-s ours) am 8022ec90: am 95c28127: Merge "Fix package check for ECJ resolved nodes" into studio-1.4-dev automerge: eceaf03 automerge: 996fe62 * commit '91ed3193874800a24f58af4e061cc3b38f2e43f4':