| commit | 9391844deb3f6a442745cea62f78aca2cea19e50 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 27 10:04:01 2015 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Tue Jan 27 10:04:01 2015 -0800 |
| tree | c8868256f6cbd8e683b45c7fa4e3d56aa26d2574 | |
| parent | b7909adcef247c627fbe8026624b9ecbeba47655 [diff] | |
| parent | b955b7224382b488a4d8d5663c92118feb8deb1e [diff] |
resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72