Prashant Malani 85d5144984 resolved conflicts for merge of bc3699b1 to lmp-dev ...

Change-Id: I1b219b5b48afb08ce3704a4f064a85652d2d9339

2014-07-24 15:29:27 -07:00

..

java

Merge "Fix no transition when only shared element exists." into lmp-dev

2014-07-24 20:48:02 +00:00

jni

fix build

2014-07-24 14:46:54 -07:00

res

resolved conflicts for merge of bc3699b1 to lmp-dev

2014-07-24 15:29:27 -07:00

tests

Fix parcel issues with empty service uuid. Added tests.

2014-07-23 10:23:10 -07:00