tree 6729de4296251a72b8ff5dfd13811fe6fc21666d
parent c270a1c878d81a77bd4eafd9970860ff93d7b2a9
parent da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5
author Prem Kumar <premk@google.com> 1418587801 +0000
committer android-build-merger <android-build-merger@google.com> 1418587801 +0000

am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev
automerge: da6ebb4

* commit 'da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749