Selim Cinek 114ef3085e resolved conflicts for merge of f3da5dc7 to master ...

Change-Id: I2013f1cb6b258b81f7d415a5e0f7daaa4eb7de80

2015-07-27 20:31:16 -07:00

..

java

Merge "Add callback-based support for Hardware Activity Recognition. b/17112184"

2015-07-27 21:41:58 +00:00

jni

am 6c3fc22c: am 5a70e76f: am 53a82e35: am 520a5c56: am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

2015-07-27 19:01:14 +00:00

res

resolved conflicts for merge of f3da5dc7 to master

2015-07-27 20:31:16 -07:00

tests

…