tree 2e7e78af4f418845d507826fe5b0db764c7f8d1c
parent b6d7c64b594ad5718813966121794f5b2df29802
parent a27565c1beec4e1be68623f4b7acba44e6c985bc
author Android Build Merger (Role) <android-build-merger@google.com> 1461883407 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461883407 +0000

Merge "Remove device whitelisting and hardcoded constants am: 9736d0f303 am: 8ca0af841b" into nyc-mr1-dev-plus-aosp