am 8e3fa5c1: (-s ours) am 16b9a0ba: (-s ours) am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.

* commit '8e3fa5c1c400e4ae239fa00c68b7753321965013':
main
Qiwen Zhao 2015-07-15 17:49:02 +00:00 committed by Android Git Automerger
commit e3735d91b4

Diff Content Not Available