tree 5d86f200d52e2f3a37294641945bdc6b6bb0db3c
parent 4a0c3bb3b67240fe2b2e4df68c2238ad3f1201b0
parent 1e69b050b864dae35bbd41acd6af49e6d2cc8f5f
author Geoff Pitsch <gpitsch@google.com> 1516631692 +0000
committer android-build-merger <android-build-merger@google.com> 1516631692 +0000

Merge "Fix unstable unittest due to RejectedExcecutionException" am: af021f6dc9 am: 552c87e5fb
am: 1e69b050b8

Change-Id: Id8dbb455c2de11aaec819ea5da9c492c7f6800b2