am 61c8829a: am 67da11c2: am 683e1663: (-s ours) am 79150645: am c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit '61c8829ab7dd496c03d8cad86f1718f28c8f7265':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]