Alan Viverette 516f953a82 resolved conflicts for merge of e4ccb864 to master ...

Change-Id: I50c41c712c4eb4f68b22777efb2e5d5370536b22

2013-10-07 18:05:09 -07:00

..

common_time

…

input

am b2db2fbc: am 6d90862f: am d65825ab: Merge "Private flags are masked in correct variable" into klp-dev

2013-10-03 16:43:17 -07:00

java

resolved conflicts for merge of e4ccb864 to master

2013-10-07 18:05:09 -07:00

jni

Private flags are masked in correct variable

2013-10-02 16:18:55 -07:00

tests/servicestests

am aa947f15: am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."

2013-10-03 15:23:23 -07:00