am e1d69c9d: (-s ours) resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

* commit 'e1d69c9d5aa3f359889fc73572a45cb89be2440a':
  resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp
This commit is contained in:
Hyunyoung Song authored and Android Git Automerger committed 2015-08-27 12:16:33 +00:00
commit 82bf63fbdf

Diff Content Not Available