commit | ef48ce24c2fac16326ea9719cae7e930633c52dc | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Thu Aug 21 13:24:02 2014 -0700 |
committer | Jason Sams <jsams@google.com> | Thu Aug 21 13:24:02 2014 -0700 |
tree | d52a6e286b9518c4f03aa7134ab23e41e9c7f480 | |
parent | 05eaedaf599c55f09035955f5dc2bf64a470190a [diff] | |
parent | adbc54f3fa8c206e2e072d0dfded1dcfb788bad1 [diff] |
resolved conflicts for merge of adbc54f3 to lmp-dev-plus-aosp Change-Id: I04f438a6fc4cd374a821c32102cc758d9a30d731