| commit | f7cf5d43aa13405f9d0dd54f6038f710a0423323 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Oct 02 11:48:08 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Thu Oct 02 11:48:08 2014 +0100 |
| tree | 76f33c6e39a9ca49ff9c1d9d776cb86115bc7ff3 | |
| parent | 92c414724f84e32df3c0f79ce11e37ef3d481611 [diff] | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 [diff] |
resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp Change-Id: I97671e62de26919e391dbb2686511584c59ab990