tree d52a6e286b9518c4f03aa7134ab23e41e9c7f480
parent 05eaedaf599c55f09035955f5dc2bf64a470190a
parent adbc54f3fa8c206e2e072d0dfded1dcfb788bad1
author Jason Sams <jsams@google.com> 1408652642 -0700
committer Jason Sams <jsams@google.com> 1408652642 -0700

resolved conflicts for merge of adbc54f3 to lmp-dev-plus-aosp

Change-Id: I04f438a6fc4cd374a821c32102cc758d9a30d731