tree 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49
parent 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5
author Andy Stadler <> 1239405887 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1239405887 -0700

AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778