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

* commit '16b9a0ba09380f2c176068005cb28eb1e1d5dbac':
main
Qiwen Zhao 2015-07-15 17:37:05 +00:00 committed by Android Git Automerger
commit 8e3fa5c1c4

Diff Content Not Available