am b4a23798: am 1150292d: am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev automerge: a0bc2e7  -s ours

* commit 'b4a237987602b4243e20eb2d6858685cb54cf0a9':
  LayoutLib: Stub AM/PM keycodes in Time Picker.
tree: f2d85bdde8799bbf0218a214485908339f0b449a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py