wchen-r7 f3cf5a8a41 Resolve merge conflict with upstream-master ...

Out of date author field

2016-02-25 14:49:53 -06:00

..

escalate

code style

2014-12-11 23:30:20 +01:00

gather

Resolve merge conflict with upstream-master

2016-02-25 14:49:53 -06:00

general

Remove unneeded width arg

2015-11-13 11:49:50 -08:00

manage

add android platform to the hash

2016-02-18 20:13:39 -06:00

recon

Consistency and API conformance changes to LES

2015-08-21 12:38:58 -05:00