tree 20418d66af620c1c16281c39524879d6ebac605e
parent af3f1a54545dadc4606b74e16416712fbd3efecf
parent 05a7a955c12318a8f44c1fea467afde96a45342b
author Xavier Ducrohet <xav@google.com> 1399599694 -0700
committer Xavier Ducrohet <xav@google.com> 1399600106 -0700

Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp

Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8