Hiroki Yamamoto 5dd3f8fa85 Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e ...

am: 3ccfa35667

Change-Id: I45ba5cbd9eda39c10c5a26405766905e45eaa6ea

2017-07-06 01:58:59 +00:00

..

java

Merge "Update the smearing methods in framework." into oc-dr1-dev

2017-07-06 01:00:59 +00:00

jni

Framework: Add libziparchive dependency

2017-07-05 13:11:47 -07:00

proto/android

…

res

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e

2017-07-06 01:58:59 +00:00

tests

Merge "Update the smearing methods in framework." into oc-dr1-dev

2017-07-06 01:00:59 +00:00