am 6ade1a01: am a24d8c88: am bdef628a: Merge "Add empty key background type"

* commit '6ade1a01d303f157df7e178f2d9c2a5ca2aae48e':
This commit is contained in:
Tadashi G. Takaoka 2013-09-26 07:54:17 -07:00 committed by Android Git Automerger
commit 1f452683c6

Diff Content Not Available