Sailesh Nepal 909d1b5755 resolved conflicts for merge of 03e88771 to master ...

Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3

2014-07-17 11:05:42 -07:00

..

java

resolved conflicts for merge of 03e88771 to master

2014-07-17 11:05:42 -07:00

jni

Launch processes running under the 'bluetooth' uid with CAP_WAKE_ALARM.

2014-07-16 18:26:48 +00:00

res

am ca27046e: Merge "Fix state list drawable transitions" into lmp-dev

2014-07-17 16:45:05 +00:00

tests

Initial KeySet API.

2014-07-14 12:50:51 -07:00