tree eb8fbffce651dd37803a506f955983cc4930e2be
parent 2326b1e4d445fac0652fb454cc32201df57314de
parent 68169d84d9dd2f136f206a494a200afbfb35b011
author Android Build Merger (Role) <android-build-merger@google.com> 1494621326 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494621334 +0000

Merge "Merge "Update Bitmap#prepareToDraw doc" into oc-dev am: d4fff1565b am: 27caadd2c4"