tree c992598aaeba09bfa1a47b4c663bb936401c92e0
parent ec16a95928704942cd49c696632d641b20c65705
parent e39752144960e36aba3db8d3c5399bce7f374011
author Christoph Studer <chstuder@google.com> 1401212719 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401212719 +0000

am f626c676: Merge "NoMan: Allow disabling SQLiteLog." into lmp-preview-dev

* commit 'f626c67604a317bbcb1963a71b66a30b92df2973':
  NoMan: Allow disabling SQLiteLog.