| commit | 1d6ca80ed6a27e324e52b8b944ef64dc07a92e34 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Thu Oct 02 10:18:00 2014 -0700 |
| committer | Glenn Kasten <gkasten@google.com> | Thu Oct 02 10:18:00 2014 -0700 |
| tree | 9005153368f770d59d724079fd83b595b728adf2 | |
| parent | 9ed996ad8766f7c88b0d0b5ffe8bb7ce8eacd24d [diff] | |
| parent | 1c92912bcb3e689dd843e7b6a5de9af4d82bd2be [diff] |
resolved conflicts for merge of 1c92912b to lmp-mr1-dev-plus-aosp Change-Id: Id873ccdfa1b9d9c157d1e1d00dcd2a980b55c386