nharold 95d36dd165 Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00 ...

am: cc51ef0a47

Change-Id: I0a9c52ca26ad1b7e4505f7c9dc32ad9550b62afc

2017-10-05 01:07:53 +00:00

..

java

Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00

2017-10-05 01:07:53 +00:00

jni

Merge "VintfRuntimeInfo: do not fetch files that are not needed" am: 3e3e26305a am: 3d1214508b

2017-09-29 09:59:20 +00:00

proto/android

…

res

Merge "Finalize resource IDs for O-MR1" into oc-mr1-dev

2017-10-05 00:08:33 +00:00

tests

Merge "Enable experimentation on notification snooze options" into oc-mr1-dev

2017-10-03 00:19:02 +00:00