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

* commit '490701a3feb84f73e5af9a2c4740f4d4be8455b7':
This commit is contained in:
Qiwen Zhao 2015-07-15 17:08:30 +00:00 committed by Android Git Automerger
commit 247aef7564

Diff content is not available