tree 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db
parent 88df1cfa1559119d5ce36d18a4faaa0f9563842e
parent 49da3570487056b7d8f654e66fb6aee06d18d4e2
author Torne (Richard Coles) <torne@google.com> 1386639194 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386639194 +0000

am 49da3570: (-s ours) am 06a27858: Record Chromium merge at DEPS revision 30.0.1599.36

* commit '49da3570487056b7d8f654e66fb6aee06d18d4e2':