tree 3582e25313048af2795633b8f68609d0297112ce
parent 368951eba0698a31ba6bd5baacb5639224ea1ded
parent 5a3e60cecae46ea74dc7ecf365927480dbf9a831
author Ben Clayton <bclayton@google.com> 1438699172 +0000
committer android-build-merger <android-build-merger@google.com> 1438699172 +0000

Merge "Fix resolving of slices / arrays / maps where keys need converting." into studio-1.4-dev automerge: 73dbd04
automerge: 5a3e60c

* commit '5a3e60cecae46ea74dc7ecf365927480dbf9a831':
  Fix resolving of slices / arrays / maps where keys need converting.