Merge commit 'aae1a0ba' into mnc-dev-plus-aosp

This commit is contained in:
Qiwen Zhao 2015-06-26 07:34:16 -07:00
commit 336636d594

Diff Content Not Available