tree 8a5245d9397ec6a4c28545930b9cc13aca3984f8
parent b06c655e580e683c44354cda8a9fbcd8f30efab6
parent 135e11df38254fca076c5e4f8e0329a62e1454c5
author Ying Wang <wangying@google.com> 1402418745 -0700
committer Ying Wang <wangying@google.com> 1402418745 -0700

resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp

Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f