Alan Viverette a2ff611fd6 resolved conflicts for merge of dca272b8 to lmp-dev ...

Change-Id: Ifbd10ace66f7488f225bfae6e26bab60ab56e651

2014-07-14 17:46:27 -07:00

..

java

Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev

2014-07-14 18:38:08 +00:00

jni

camera2: Update shader scaling matrix for legacy mode.

2014-07-14 22:57:07 +00:00

res

resolved conflicts for merge of dca272b8 to lmp-dev

2014-07-14 17:46:27 -07:00

tests

Initial KeySet API.

2014-07-14 12:50:51 -07:00