tree 4298bb59e37a9f1ea05e89391564c3bb13f75732
parent 49968f0903eb69b1505bc99926344aacee4e81b6
parent ea868b3846794cd36424f477503377ea9348137a
author Doug Zongker <dougz@google.com> 1394591966 -0700
committer Doug Zongker <dougz@google.com> 1394591966 -0700

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

Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1