Automatic translation import

Change-Id: Ia9a968d4fd8dbb116f1e5329f37b13665b66bafc
Underp the dialpad buttons

 * Fix weirdo button that joined us with a bad merge

Change-Id: Id54a5883d0fca789f8f53a851363d6eda2aae6af
Revert "Underp the dialpad buttons"

This reverts commit f46c62424361ba5aced620433baefb12ee4bf2d4.

Change-Id: I2e875a0ae86495ae14fef4bbc292ec80883e8914
Automatic translation import

Change-Id: I8cc3bb514f7981129a7b39900f063b579e22ee10
Automatic translation import

Change-Id: I1ccdd8471c4fa20f917c9184fe40338049a374d4
Merge branch 'upstream/cm-11.0'