am c0977c85: (-s ours) reset to ub-mail-master-release at 1235730

* commit 'c0977c85804623c2407fff419a69b5524cadc357':
This commit is contained in:
Qiwen Zhao 2014-08-25 16:18:18 +00:00 committed by Android Git Automerger
commit d6f7cdf4c7

Diff Content Not Available