tree e852141cbe91c0cea9c1e3256af16e381a9f0a58
parent a7f485b089540c6cd6a387b9220a88e54448569e
parent 3882fb8c9281a33c56377f20e865c8a858ee50d9
author Jerome Dochez <jedo@google.com> 1459804818 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459804818 +0000

Merge "ResourceSet: store isFromDependency in incremental state" into studio-2.0-release