{"shas":[["b87c34b1c7e38c5db5fd95b612a6c65c41cb5503","1f1e67e5fdb25d2e5cd18ddc0fee425272daab56@donthorp.net","Merge pull request #434 from marshall/timob-5122\n\nTIMOB-5122: Add a member function to View called 'convertPointToView'","Don Thorp"],["2d23cf57033b3a88152456be5fcbcfb08ee7c1d3","1f1e67e5fdb25d2e5cd18ddc0fee425272daab56@donthorp.net","[TIMOB-2102] Fix merge conflict","donthorp"],["d1aa6b140fc66a2e51b5036991b9f5cc064b222a","2e17b68e3ddd7cd48b8b490b483b05413ca28ec1@gmail.com","Merge pull request #412 from donthorp/timob-2102\n\n[TIMOB-2102] Implentation of keepScreenOn an Android only feature.","Marshall Culpepper"],["d49148f6c2262ba855fea479f94a1ca348360cc7","1f1e67e5fdb25d2e5cd18ddc0fee425272daab56@donthorp.net","Merge pull request #429 from dizzymonkey/timob-5173\n\nTIMOB-5173 modify TiBaseActivity to keep track of lightweight window crea","Don Thorp"],["aac085f546eb220e92c2967653e380443f2ee1f4","2c6d680f5c570ba21d22697cd028f230e9f4cd56@salsa4fun.co.il","Merge remote-tracking branch 'upstream/master'","Uri Shaked"]],"ref":"refs/heads/master","size":5,"head":"aac085f546eb220e92c2967653e380443f2ee1f4","push_id":41578028}