| commit | 0c0ab6bb066a40c781fcd3268db5e6c4d70ffcf6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Nov 25 11:00:41 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Nov 25 11:00:41 2014 -0800 |
| tree | e36441cca0aadc154b0e40db42eabb28e6cd955c | |
| parent | 96fb5d20388464bb9470f6d47e26f34058c36ac3 [diff] | |
| parent | db38d10a48ca137097f961e40846edbbada00ea6 [diff] |
resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b