Sandeep Siddhartha 1ea615c8df am dfa94cdc: am e1516d4d: am d5099116: Merge "Use @IntDef for manage actions" into lmp-dev ...

* commit 'dfa94cdcec692ccc911a1c416e4c4a98db84c3c4':
  Use @IntDef for manage actions

2014-08-06 17:34:29 +00:00

..

java

am dfa94cdc: am e1516d4d: am d5099116: Merge "Use @IntDef for manage actions" into lmp-dev

2014-08-06 17:34:29 +00:00

jni

am e94f3851: am c9938987: Add resize method for virtual displays

2014-08-05 21:31:01 +00:00

res

Import translations. DO NOT MERGE

2014-08-06 10:11:44 -07:00

tests

Revert "Revert "Service data and manufacturer data can be repeated fields.""

2014-08-01 11:12:37 -07:00