tree b093743b40e61d3bf82bc18f20d538d28c3ae124
parent 05420e77f5358fc7a8996b39daf3aa976b826b53
parent 86e67d708d738807c843850a3b6c9170e514ff8f
author Sergio Giro <sgiro@google.com> 1443694604 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443694604 +0000

am 86e67d70: Merge "frameworks/base: delete TinyHashMap"

* commit '86e67d708d738807c843850a3b6c9170e514ff8f':
  frameworks/base: delete TinyHashMap