tree 88452f49ea8936170c9f965dee3ceb8f9c35271a
parent b098d7789e6621f3fce9611d894e4247e2eb221f
parent e091a345b250b1ce4212d4c9d13649fe9c625bbe
author Shubham Ajmera <shubhamajmera@google.com> 1458040271 +0000
committer android-build-merger <android-build-merger@google.com> 1458040271 +0000

Fix compatibility issues with Java 1.8 Map
am: e091a345b2

* commit 'e091a345b250b1ce4212d4c9d13649fe9c625bbe':
  Fix compatibility issues with Java 1.8 Map