tree 8614df9a562640950d01c253a99cfe4ebd9ae2ce
parent 84b645bc0043b01f1f6a8afc8808c6984df83982
parent 48db7e6dcd78a9b5dda896ab022e4e4285af91b5
author Jason Monk <jmonk@google.com> 1501259205 +0000
committer android-build-merger <android-build-merger@google.com> 1501259205 +0000

Merge "QS Tweaks" into oc-dr1-dev
am: 48db7e6dcd

Change-Id: I0450c4ad8e517a642cf7fea7d9302874e3229e57