Adam Lesinski 06f380e9ef am 95731abe: am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev ...

* commit '95731abeae49eac57911068ac8545f4eba2ae58d':
  Fix issue with using locally defined attrs in a shared lib

2014-10-01 17:02:18 +00:00

..

java

am 4ddacc46: am 0a62ab70: Merge "Camera2 Legacy: Set a default thumbnail size" into lmp-dev

2014-10-01 15:15:43 +00:00

jni

am bb7b5197: am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev

2014-10-01 15:16:02 +00:00

res

am 5c35f2a4: am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev

2014-10-01 17:02:14 +00:00

tests

NetworkStats always needs arrays.

2014-09-17 09:26:31 -07:00