a82a219a
b243aabd
adaa12cd
* commit 'a82a219a7aaee82d790810f6660924604b7a7e81': Merge adaa12cd from honeycomb. do not merge.