am e8622174: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe

* commit 'e862217461bdf0d460b71d80b800a86be1eb61fc':
main
Qiwen Zhao 2015-07-15 17:17:27 +00:00 committed by Android Git Automerger
commit 2bc2b351eb

Diff Content Not Available