tree c655b0c115ffe34e1133ca0ba86dbf222f23fe76
parent 6a58862af87f92fa29fde9a2325439f42ad6e7eb
parent 166b0abf13af62ba577b898d4c5ad806f691604a
author Shreyas Basarge <snb@google.com> 1465931042 +0000
committer android-build-merger <android-build-merger@google.com> 1465931042 +0000

Merge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
am: 166b0abf13

Change-Id: I8cfeb60e96a58d6778488c1b4c3ce9565a11bf88