Shaowei Shen 59b814ff67 Merge "Update javadoc of BackupObserver"

2018-05-17 01:45:21 +00:00

..

java

Merge "Update javadoc of BackupObserver"

2018-05-17 01:45:21 +00:00

jni

Merge "Add support for manually set surround formats." into pi-dev am: eddc0d712c

2018-05-15 14:51:25 -07:00

proto

Merge "Remove ro.retaildemo.video_path from proto"

2018-05-17 01:08:35 +00:00

res

Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: fa05aa0ff8

2018-05-16 16:57:04 -07:00

tests

Merge "Disable AAPT2 for modules that use missing features" am: 87dc8d6576 am: 1d9a9610ae

2018-05-16 14:31:31 -07:00