commit | f802c625cad155b30ba9bc0fc9c7a383d7112183 | [log] [tgz] |
---|---|---|
author | Selim Cinek <cinek@google.com> | Fri May 26 19:50:42 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 26 19:50:42 2017 +0000 |
tree | 1578e3566db32eb6a85b70a7edfc16cdc213c8fc | |
parent | daeafccfa962d9ec3a72c6a2e96e0025383e204c [diff] | |
parent | 76926df97e407bf1df2373ac9c9a1e579e9dd46a [diff] |
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev am: 76926df97e Change-Id: I7183050c98b5f1eb9f8a8a7dbfe4b7b75a1c3be7