| commit | fd76bb5f931dd1a1754bd4558ea935cf4ce241b7 | [log] [tgz] |
|---|---|---|
| author | Christoph Studer <chstuder@google.com> | Tue May 27 17:45:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 27 17:45:25 2014 +0000 |
| tree | c992598aaeba09bfa1a47b4c663bb936401c92e0 | |
| parent | 21b6c49a2d6ef8beb2a1f5d4910ce2c96eac171f [diff] | |
| parent | d68200c66b775ae991e9217dd021ef3713f4cc8e [diff] |
am aafcbc8f: (-s ours) Merge "NoMan: Disable SQLite log DO NOT MERGE" into lmp-preview-dev * commit 'aafcbc8f030c6de7fbb77272d588de53a96b9a35': NoMan: Disable SQLite log DO NOT MERGE