| commit | 11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Dec 11 14:33:58 2014 -0800 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Dec 11 14:33:58 2014 -0800 |
| tree | 2235b3628109d04c7a62e836870630fef1129db3 | |
| parent | 803434b0e3334a7bdb7ebbcf9e312b4adfcee08f [diff] | |
| parent | ed0bdd422da488289ec829d2d59b74e7be3eaaec [diff] |
resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp Change-Id: Ife8b72d3688ed78a95ccb8d5e0b60f40e7fec9e9