tree f754568f0e04f8bbe985bfd5b6bcad5f9f9c03cc
parent ee0653825f9424fab0e051e317cc11fc3a0a440a
parent a3170fa2e80cd35d1677930d667d518d5d258c7a
author Anders Kristensen <andersk@google.com> 1396032560 -0700
committer Anders Kristensen <andersk@google.com> 1396037344 -0700

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

Change-Id: I5e8217fbe5336ebfa91eddf11e7f46465be8f751