tree 149bc43ddf3018383d09b6d30ac6b7b099a7b59e
parent 35d7cd40bb167ee08bbb855195eb395e77a05b7a
parent 39b51b4968c0aeeef84d5d75ef683516e658a30d
author Rich Slogar <rslogar@google.com> 1430874004 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430874004 +0000

am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs

* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
  docs: memory monitor duplicate paragraph