tree fa1af119f8fb4bf40126db871fcb9b5d584fccff
parent 42acb6795521844482a1325279ee5e71f0e49d18
parent 678b8ce90552df185cd9610d7d5b85643d51fd09
author Martin Hibdon <mhibdon@google.com> 1414960322 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414960322 +0000

am 678b8ce9: am 6909a041: am 3d629f5c: am 81c9c04a: am c3378522: Merge "Display a warning if account is on security hold" into ub-gmail-ur14-dev

* commit '678b8ce90552df185cd9610d7d5b85643d51fd09':
  Display a warning if account is on security hold