tree 683753c3d1817d59049ec4ac7e90fbe6312f6fb5
parent 48ca6cba8af8700d5477b7835935b84363057f0b
parent 21e0f33ed0fedbc6362dfcdfb78d17f0fd48e3f5
author Android Build Merger (Role) <android-build-merger@google.com> 1466602633 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466602634 +0000

Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am: ba568a46e6 am: 045fd29c75" into nyc-mr1-dev-plus-aosp