Amith Yamasani 7511526792 resolved conflicts for merge of 83726dfc to master ...

Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98

2014-08-20 08:41:02 -07:00

..

java

resolved conflicts for merge of 83726dfc to master

2014-08-20 08:41:02 -07:00

jni

am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev

2014-08-19 19:49:10 +00:00

res

am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications

2014-08-20 13:59:14 +00:00

tests

Stop using LinkProperties for static configuration.

2014-08-19 11:59:43 -07:00