| commit | 996e9e334856bca8c692b1e90383fcaa212a542d | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Fri Sep 11 19:40:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 19:40:13 2015 +0000 |
| tree | e8aeb68e8affeef6e6095a65ff158f0f6cd94c90 | |
| parent | 5661fd4e607d5272cc279cd2515f863b9058e23f [diff] | |
| parent | 3134d329b2504ee352ef8f4f5a06412686fd492c [diff] |
am 3134d329: am 2eed31d8: am 5ab9857e: Merge "Disable Ui rendering tests on watch" into lmp-sprout-dev * commit '3134d329b2504ee352ef8f4f5a06412686fd492c':