commit | 643055a12a3ee445abd2273b34516427126e2baf | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Thu Aug 27 10:41:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:41:30 2015 +0000 |
tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
parent | 5c7bea4947d294d51679d5c62cf25c1cf6fc40a9 [diff] | |
parent | 0f84781bbab1c2f2d982b962507898f8351ed6fd [diff] |
am 0f84781b: (-s ours) am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev * commit '0f84781bbab1c2f2d982b962507898f8351ed6fd':