commit | 60e71c81f4761d5fb93a2ba47d140541949016e8 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu May 25 23:53:05 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 25 23:53:11 2017 +0000 |
tree | 6aece98da9ba317d88514d445d5bfc568e3d0a37 | |
parent | f84fd9af9507b00a22cbe9a29e0078aa8a5b5e38 [diff] | |
parent | d04970da5d749028ba29b6d5b198a40242783cbf [diff] |
Merge "Merge "Merge "Fix safezone and getAlpha b/38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am: cca181bfbb" into oc-dev-plus-aosp am: fa5f8fa8a8"