| commit | 42e0817b45ed16a106998ad263c5d842a945b955 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Oct 09 12:12:49 2014 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Thu Oct 09 12:12:49 2014 -0700 |
| tree | a13a2aae7e8f8edbdb5ac78d477f0f56bc2d3dde | |
| parent | 95296d4129b5a269869a0671010930786cf02399 [diff] | |
| parent | c9734d24d92f4737f5ab3808c77d816a1b084582 [diff] |
resolved conflicts for merge of c9734d24 to lmp-dev-plus-aosp Change-Id: I2ced64fed071f126725a8cdbd12d7c1f45ab7947