| commit | 1272887050a269d6d506b42099c2857847ad100b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Nov 10 20:54:07 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Mon Nov 10 20:54:07 2014 -0800 |
| tree | 6770318c0302a4e486224bb87b46dcb1f9a68047 | |
| parent | cba06c2272c8bce7d10b2a7ee762d12043f3252a [diff] | |
| parent | 1d03b816fea1b964cc5db4d11ddcba9b25f45d99 [diff] |
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172