| commit | 938473a7f031822d7449624f5844c07d23814422 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 08 16:21:24 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Sep 08 16:21:24 2014 -0700 |
| tree | d5d2c9fd2a0163a9fe948cd8bbc4cf1ef61982d8 | |
| parent | 2af51cacde8e8e15639352f96e46cbc9e9e6a4f6 [diff] | |
| parent | 7efad83d430f4d824f2aaa75edea5106f6ff8aae [diff] |
resolved conflicts for merge of 7efad83d to lmp-dev-plus-aosp Change-Id: I3994c3c69e187e08d69642e097de14b5040c5b3b