| commit | 70acd9b36a9fc0d212b25d64f4edf0fc582331cf | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Tue Dec 09 09:07:25 2014 +0100 |
| committer | Sebastien Hertz <shertz@google.com> | Tue Dec 09 10:16:46 2014 +0100 |
| tree | 8dbb672f82653ff8848db3adfe9ade32f10d5a26 | |
| parent | e417db6d574e90566e827bb2a1e5efeaa9c6d42e [diff] | |
| parent | beb84982a1e8c192bb509ad3c72efb9e529c7f2d [diff] |
resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d