tree 9bc27f02bbe86119edcc6e8c6f6494b9ff7a1272
parent ee00a68bc857ff5a3f648e46a359af088d52e5ed
parent f8aaeeca39a96cae192300f5e267a4438f0cd68a
author Jin Cao <jinyan@google.com> 1414957893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957893 +0000

am f8aaeeca: am 9c7caa80: am fd922200: am 83a634a6: Merge "Don\'t confirm if discarding empty message" into ub-gmail-ur14-dev

* commit 'f8aaeeca39a96cae192300f5e267a4438f0cd68a':
  Don't confirm if discarding empty message