John Reck 088c514cb1 resolved conflicts for merge of be70c771 to master ...

Change-Id: I469905bef7361c18aab725778694567d1987c06d

2014-11-06 13:04:49 -08:00

..

java

am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

2014-11-06 16:36:04 +00:00

jni

resolved conflicts for merge of be70c771 to master

2014-11-06 13:04:49 -08:00

res

am 34c45bb9: am b2a6c7b8: am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev

2014-11-06 16:36:04 +00:00

tests

am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev

2014-11-05 21:43:10 +00:00