| commit | 1cc55fca0deebe7f0a262fd1ba173b527548ad18 | [log] [tgz] |
|---|---|---|
| author | destradaa <destradaa@google.com> | Tue Oct 07 11:01:55 2014 -0700 |
| committer | destradaa <destradaa@google.com> | Tue Oct 07 11:01:55 2014 -0700 |
| tree | af5bee70659285dbb0d89707babba8d4ddc0dd7b | |
| parent | 51bc0285e21af359d15c26d88d37b088d0a711ab [diff] | |
| parent | a26299403eeac884d62c058ec6bf51751d1508be [diff] |
resolved conflicts for merge of a2629940 to lmp-dev-plus-aosp Change-Id: Id3c70419bd100e15b11d1be27de83bef6483001b