tree be4b5c8a57c0db83978d431a6897b1b694ed54a2
parent f1708242d5b83c4b1aabec134a09bd4516dd327d
parent 16ccdd01f9b7b69041decfbd484d6a399aec7904
author Makoto Onuki <omakoto@google.com> 1435083277 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435083278 +0000

Merge "Support grayscale bitmap" into mnc-dev