tree 339b0af4b8571fb1ace4b4adf19db112dd6d550e
parent 1ffde8abbed48172014a733fe21c1be4137b3b67
parent 10c2607c3cc4903ca8dcbe2245f66d21af199865
author Christopher Ferris <cferris@google.com> 1391446801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391446801 +0000

am 10c2607c: am 77b23023: am 3faf86c0: Merge "Call a specialized local map set."

* commit '10c2607c3cc4903ca8dcbe2245f66d21af199865':
  Call a specialized local map set.