| commit | 29d1b12ddae8950ee7d2a8f31a040340185a331e | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Sat Nov 22 01:08:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 22 01:08:42 2014 +0000 |
| tree | 890d5ff30ba2fef9856dbda18a0d1abe2c3a01d0 | |
| parent | f2d270a91460e0997fe33275c8ea113bdbcf5db7 [diff] | |
| parent | 05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1 [diff] |
am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"" * commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1': Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"