| commit | 38c3386a6cd44789f540fb9700c284345e7269e3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Nov 25 11:45:46 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Tue Nov 25 11:45:46 2014 -0800 |
| tree | 64472dc40352949e03460907c7c882f885dac5e1 | |
| parent | 8e76610cfc729ad1e2cd4f0cd29007ee32c09172 [diff] | |
| parent | 03be4928422bd601bce3267fcf69b160f175db6d [diff] |
resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp Change-Id: I7c72ed2c54ceae19c9dfe8b2e1707f869faad110