am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb
am b5e5b2d9: Merge "Tapping inside an EditText should always pop up the IME." into honeycomb

* commit 'b5e5b2d99b6b56798f863b24b786c351d9b22cf3':
  Tapping inside an EditText should always pop up the IME.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base