tree 88452f49ea8936170c9f965dee3ceb8f9c35271a
parent 1df8c42a2def6b8f4bb1217c4e73ede1694649ac
parent 2526b94c32a5d030bb705c8622863205df463567
author Shubham Ajmera <shubhamajmera@google.com> 1457962421 +0000
committer android-build-merger <android-build-merger@google.com> 1457962421 +0000

Merge "Fix compatibility issues with Java 1.8 Map"
am: 2526b94c32

* commit '2526b94c32a5d030bb705c8622863205df463567':
  Fix compatibility issues with Java 1.8 Map