tree ceeee0b803de8ed230c811e1f4016ae21c883c5e
parent bda9c9f266c12fd723249887fcc5230ecb6b5fc5
parent 0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c
author Dianne Hackborn <hackbod@google.com> 1436478963 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436478963 +0000

am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit '0e7d497c10c4f5096cf4cd32a56784fd18ab0f2c':
  Fix issue #22328792: Fix scalability issues in AssistStructure