tree 4cbc9f9135021777a38df5777b79467fe1212730
parent 653998a550724ffea46127b55bb5bd00d9212104
parent a47abeaf59f6523a50a8f0bec604282278cb23ec
author Tao Bao <tbao@google.com> 1440652251 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652251 +0000

am a47abeaf: (-s ours) am f0821521: Merge "RazorG: Reduce the journal size to zero."

* commit 'a47abeaf59f6523a50a8f0bec604282278cb23ec':