tree 89bb51ce21d459f8eb006079d25b8058189f9816
parent f8aabcf6c8dab8d96d8477aee3ce22c51bf435a7
parent 966feb64245c09f7169690438f518b89b2f4933b
author Android Build Merger (Role) <android-build-merger@google.com> 1499295536 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499295536 +0000

Merge "Merge "Add a convenience method to facilitate tests" into oc-dr1-dev am: 7a4157d7b4" into oc-dr1-dev-plus-aosp