| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Sep 08 13:08:43 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Sep 08 13:08:43 2014 -0700 |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 [diff] | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 [diff] |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850