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

* commit '0a0acc3b8d8167c2ebedb8f26379a6ee90a2fe0b':
This commit is contained in:
Qiwen Zhao 2015-07-15 17:48:59 +00:00 committed by Android Git Automerger
commit 38675be227

Diff content is not available