am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap...
am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
* commit '410635e7':
Fix potential synchronization issue in bitmap pool