tree 3aeb4315029e68d80d84f6bde3024359d6a44dac
parent 3da8b7398645764fbbebb220a6c0dd7924d73425
parent 80d0d75521fa8d539bbb5afb506b1e632dfdab7d
author Hall Liu <hallliu@google.com> 1505414386 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505414386 +0000

Merge "Adjust testapps for API changes" into oc-mr1-dev