tree 5c2c9d8ff22d6d49ba3f1959c2101fa8fd070a94
parent 25864da0bccd37ecd26c6e2ffe474a338af544ca
parent 2dc2cdc026e8494c09f0cc44205cf22f513b78eb
author Dianne Hackborn <hackbod@google.com> 1436483553 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436483553 +0000

am 2dc2cdc0: am 1dfeb0b2: am d0e005de: am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit '2dc2cdc026e8494c09f0cc44205cf22f513b78eb':
  Fix issue #22328792: Fix scalability issues in AssistStructure