| commit | 165e4d220202ed386e5b7ebf3a6bde0d335eb227 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Aug 12 13:28:08 2014 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Tue Aug 12 13:28:08 2014 -0700 |
| tree | d1f581c15aee8ce5e9af6d94021fe02b23bb1d05 | |
| parent | d1d0e2bcca941530d9f4e389d2b1aad2c0fd115d [diff] | |
| parent | e4ec1e94ed38eab5c0fdb964182f8ea9b8939750 [diff] |
resolved conflicts for merge of e4ec1e94 to lmp-dev-plus-aosp Change-Id: Iec97b6a1cb7c29073bf9d1ae37d8600ff2ae9a8b