summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-12Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I2383a608d3928c16f9e2f3b099d44dc0a3786d00 Auto-generated-cl: translation import
2015-08-10am 891f4f99: (-s ours) am 8beab3e8: am 83e68ad7: am 5fb5180e: am ba55aab3: ↵Jay Shrauner
DO NOT MERGE Null check CallList mapping in callbacks * commit '891f4f993bb3f747cb9605c06110e1a87ec6fb1a': DO NOT MERGE Null check CallList mapping in callbacks
2015-08-10am 8beab3e8: am 83e68ad7: am 5fb5180e: am ba55aab3: DO NOT MERGE Null check ↵Jay Shrauner
CallList mapping in callbacks * commit '8beab3e830e17f2413ea6866463ba4bb0723a490': DO NOT MERGE Null check CallList mapping in callbacks
2015-08-10am 83e68ad7: am 5fb5180e: am ba55aab3: DO NOT MERGE Null check CallList ↵Jay Shrauner
mapping in callbacks * commit '83e68ad7700ef2e68aac6ca417b3e99030781bee': DO NOT MERGE Null check CallList mapping in callbacks
2015-08-10am 5fb5180e: am ba55aab3: DO NOT MERGE Null check CallList mapping in callbacksJay Shrauner
* commit '5fb5180e21849fe519bd21ea44e116af89b07c4c': DO NOT MERGE Null check CallList mapping in callbacks
2015-08-10am ba55aab3: DO NOT MERGE Null check CallList mapping in callbacksJay Shrauner
* commit 'ba55aab35a4402a090f530422d1f7327aebfde04': DO NOT MERGE Null check CallList mapping in callbacks
2015-08-10am 52d58ff6: (-s ours) am be75c0bc: (-s ours) am 3a08370a: (-s ours) am ↵Geoff Mendal
e638ef37: (-s ours) Import translations. DO NOT MERGE * commit '52d58ff682e433b2e6562a0c94f0debc0d0e6144': Import translations. DO NOT MERGE
2015-08-10am be75c0bc: (-s ours) am 3a08370a: (-s ours) am e638ef37: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit 'be75c0bcfb3dcc5e87131896a3505a30a9e87ae3': Import translations. DO NOT MERGE
2015-08-10am 3a08370a: (-s ours) am e638ef37: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '3a08370a734d9e1bcca027051bbe113a6a361a94': Import translations. DO NOT MERGE
2015-08-10am e638ef37: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'e638ef37ad2b9472c0e8f7b3439ed098fb43426d': Import translations. DO NOT MERGE
2015-08-10Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I1b62b0b5fa3abd3e75c6bf73d2a81ab38501885f Auto-generated-cl: translation import
2015-08-10Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If9e50b023cb323ce17acd5d7bc7bc4071a534a4d Auto-generated-cl: translation import
2015-08-08DO NOT MERGE Null check CallList mapping in callbacksJay Shrauner
In onPostDialWait, onDetailsChanged, and onConferenceableCallsChanged callbacks, check to make sure the call list contains a mapping for the Telecom Call object. Bug:23031241 Change-Id: I2a9703d9c303fe0b2e320d811d21c71e5c429269 (cherry picked from commit 71a6555ac854303dc023c5e6c9a27c63ec956e3d)
2015-08-07Null check CallList mapping in callbacksJay Shrauner
In onPostDialWait, onDetailsChanged, and onConferenceableCallsChanged callbacks, check to make sure the call list contains a mapping for the Telecom Call object. Bug:23031241 Change-Id: I2a9703d9c303fe0b2e320d811d21c71e5c429269
2015-08-07am ecd03f67: am ff12cb26: am c3f68285: am af99da31: Merge "Show "Note sent" ↵Tyler Gunn
toast when starting outgoing call with a note." into mnc-dr-dev * commit 'ecd03f678fa150b67c882aeb14178c0ada5af42c': Show "Note sent" toast when starting outgoing call with a note.
2015-08-07am ff12cb26: am c3f68285: am af99da31: Merge "Show "Note sent" toast when ↵Tyler Gunn
starting outgoing call with a note." into mnc-dr-dev * commit 'ff12cb266aa255eff55bbf9750db9d3f6d21e2be': Show "Note sent" toast when starting outgoing call with a note.
2015-08-07am c3f68285: am af99da31: Merge "Show "Note sent" toast when starting ↵Tyler Gunn
outgoing call with a note." into mnc-dr-dev * commit 'c3f68285035d9fd033afff61c1894f13178f9abc': Show "Note sent" toast when starting outgoing call with a note.
2015-08-07am af99da31: Merge "Show "Note sent" toast when starting outgoing call with ↵Tyler Gunn
a note." into mnc-dr-dev * commit 'af99da31785586e64616e0ccf418dbd41d0a84be': Show "Note sent" toast when starting outgoing call with a note.
2015-08-07Merge "Show "Note sent" toast when starting outgoing call with a note." into ↵Tyler Gunn
mnc-dr-dev
2015-08-06am 816693cf: am b0c84ec0: am 05ca4053: am 7d4ecade: am be729e6f: Catch ↵Yorke Lee
RuntimeException when calling setExcludeFromRecents * commit '816693cf5b228ad136f6103c4a7dfca91d54458f': Catch RuntimeException when calling setExcludeFromRecents
2015-08-06am b0c84ec0: am 05ca4053: am 7d4ecade: am be729e6f: Catch RuntimeException ↵Yorke Lee
when calling setExcludeFromRecents * commit 'b0c84ec0af3161eb685519d36ea9a1a67ceb30c4': Catch RuntimeException when calling setExcludeFromRecents
2015-08-06am 05ca4053: am 7d4ecade: am be729e6f: Catch RuntimeException when calling ↵Yorke Lee
setExcludeFromRecents * commit '05ca40535a0f35a1e42b2182c2bbbb73ced0adab': Catch RuntimeException when calling setExcludeFromRecents
2015-08-06am 7d4ecade: am be729e6f: Catch RuntimeException when calling ↵Yorke Lee
setExcludeFromRecents * commit '7d4ecade5cd3d169a2ec1229b7177f25c0141f97': Catch RuntimeException when calling setExcludeFromRecents
2015-08-06am be729e6f: Catch RuntimeException when calling setExcludeFromRecentsYorke Lee
* commit 'be729e6fd69f30a97b669b009d608ac7395919c7': Catch RuntimeException when calling setExcludeFromRecents
2015-08-06Catch RuntimeException when calling setExcludeFromRecentsYorke Lee
Bug: 22924782 Change-Id: I1da931b805658376fb9db418210662273d9c1db8
2015-08-05Show "Note sent" toast when starting outgoing call with a note.Tyler Gunn
Bug: 22685114 Change-Id: Icc84b3639d7a5d4cf4faaa2db5ed70f2d9b2e967
2015-08-05resolved conflicts for merge of f6832a9e to masterTyler Gunn
Change-Id: Ifcbde3917781b9a7f5b9b23497bdbb707cf65f83
2015-08-05am 146f2d48: am 317483bd: am 916be122: Merge "Last forwarded number and ↵Tyler Gunn
incoming call subject." into mnc-dr-dev * commit '146f2d489cebadc958874955e89fb786fba8cb17': Last forwarded number and incoming call subject.
2015-08-05am 317483bd: am 916be122: Merge "Last forwarded number and incoming call ↵Tyler Gunn
subject." into mnc-dr-dev * commit '317483bd8871965ba6552d7bf332b72330c085ad': Last forwarded number and incoming call subject.
2015-08-05am 916be122: Merge "Last forwarded number and incoming call subject." into ↵Tyler Gunn
mnc-dr-dev * commit '916be12215ce79ee1f7b82887b19e405c3a35ea7': Last forwarded number and incoming call subject.
2015-08-05Merge "Last forwarded number and incoming call subject." into mnc-dr-devTyler Gunn
2015-08-05Last forwarded number and incoming call subject.Tyler Gunn
Last forwarded number: - Added assets for the "forward" icon for last forwarded number. - Modified InCall Call to store last forwarded number; also calls onLastForwardedNumberChange callback (the last forwarded number is received via a supp service update, so may change after call starts). Call subject (i.e. instant lettering): - Added placeholder subject_bubble asset to form the chat bubble for incoming calls with a subject. - Modified InCall Call to store the call subject (expected to be populated in extras at start of call. - Added code to hide the call status (e.g. "incoming call via XYZ") line and primary call label (e.g. a location "California", or the number type "Mobile" for the number). This was necessary to make room for the call subject bubble, and is in line with the UX mocks. - Change call subject text color to background color of call card (per UX mocks) - Modified call notification to show call subject if it is specified. - Moved code to show HD icon into common method. Bug: 22685114 Change-Id: I22d9dae16658490e3245cfdd9c936bb0584cd6db
2015-08-05am 40098ddf: (-s ours) am 226a2757: (-s ours) am 3eca1f1e: (-s ours) am ↵Geoff Mendal
06ace6a8: (-s ours) Import translations. DO NOT MERGE * commit '40098ddf8e3d287c0dd3a280edfdbf686183ab57': Import translations. DO NOT MERGE
2015-08-05am 226a2757: (-s ours) am 3eca1f1e: (-s ours) am 06ace6a8: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit '226a27575d46a6643156f0ea73a17e43dd362563': Import translations. DO NOT MERGE
2015-08-05am 3eca1f1e: (-s ours) am 06ace6a8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '3eca1f1e4a82e9c00233df3b5adf7f443892529c': Import translations. DO NOT MERGE
2015-08-05am 06ace6a8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '06ace6a82567c75588b4f7dac7f8356735f59e8e': Import translations. DO NOT MERGE
2015-08-05Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Iae6a582a4f83bd8af06efa9c802ba1eeadff4fe6 Auto-generated-cl: translation import
2015-08-05Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ia764f4eff4bafbe740dc3e8edbb5c12f5bada063 Auto-generated-cl: translation import
2015-08-04am d0a75608: am f26f4aec: am 47c8d67a: am c692db1f: am 74573496: Merge "Fix ↵Andrew Lee
time and details alignment in RTL." into mnc-dev * commit 'd0a7560839fb9d5c1bba5dab507c4c07a9c33691': Fix time and details alignment in RTL.
2015-08-04am f26f4aec: am 47c8d67a: am c692db1f: am 74573496: Merge "Fix time and ↵Andrew Lee
details alignment in RTL." into mnc-dev * commit 'f26f4aece222485de4b9c6c2a6a922474466fc08': Fix time and details alignment in RTL.
2015-08-04am 47c8d67a: am c692db1f: am 74573496: Merge "Fix time and details alignment ↵Andrew Lee
in RTL." into mnc-dev * commit '47c8d67aed3f3b3a4c0252b5dea1394e9853e998': Fix time and details alignment in RTL.
2015-08-04am c692db1f: am 74573496: Merge "Fix time and details alignment in RTL." ↵Andrew Lee
into mnc-dev * commit 'c692db1f9f5db18dc1187938173939855afb5888': Fix time and details alignment in RTL.
2015-08-04am 74573496: Merge "Fix time and details alignment in RTL." into mnc-devAndrew Lee
* commit '745734969d69f4eb0e919e9945758905ce3455ce': Fix time and details alignment in RTL.
2015-08-04Merge "Fix time and details alignment in RTL." into mnc-devAndrew Lee
2015-08-04Fix time and details alignment in RTL.Andrew Lee
Bug: 22155815 Change-Id: Ie82b9970d1d5794b8ff7e7606fd63df14516e480
2015-08-04am e3648be8: am 256e4a6f: am 536a7d45: am 4283df0c: am 50ccc0c6: Fix NPE in ↵Jay Shrauner
onDetailsChanged * commit 'e3648be86776e9319ef943a04c70ac0bb2cb5a9a': Fix NPE in onDetailsChanged
2015-08-04am 256e4a6f: am 536a7d45: am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChangedJay Shrauner
* commit '256e4a6fd8d52a7392a68e36d0a5cd68267dff0b': Fix NPE in onDetailsChanged
2015-08-04am 536a7d45: am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChangedJay Shrauner
* commit '536a7d457a14a4deb9dee5b2cdc568fd9ec71ef9': Fix NPE in onDetailsChanged
2015-08-04am 4283df0c: am 50ccc0c6: Fix NPE in onDetailsChangedJay Shrauner
* commit '4283df0c5e59792dc6d5711ea6eb91eb11d2dffd': Fix NPE in onDetailsChanged
2015-08-04am 50ccc0c6: Fix NPE in onDetailsChangedJay Shrauner
* commit '50ccc0c6cbfc1fce25ada87da13f4e974612d2a8': Fix NPE in onDetailsChanged
2015-08-03Fix NPE in onDetailsChangedJay Shrauner
Bug:22925987 Change-Id: I20ad0ea5e40342805a2004654e6b78f420c33873
2015-08-01am fa5ed493: (-s ours) am 56ba4a80: (-s ours) am 9bb9fc15: (-s ours) am ↵Geoff Mendal
1480c09d: (-s ours) Import translations. DO NOT MERGE * commit 'fa5ed4936c3e3c6b0be4be04ba7375f01d946981': Import translations. DO NOT MERGE
2015-08-01am 56ba4a80: (-s ours) am 9bb9fc15: (-s ours) am 1480c09d: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit '56ba4a8055959baa686db3021a855eb5cdb2306e': Import translations. DO NOT MERGE
2015-08-01am 9bb9fc15: (-s ours) am 1480c09d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '9bb9fc15570eb2b8461a814369f90c7d45372d74': Import translations. DO NOT MERGE
2015-08-01am 1480c09d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '1480c09d957c2d535b240f44d3be6639700d03e7': Import translations. DO NOT MERGE
2015-07-31Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I8812f47e024e5b569e3cc3eb2cccecb95afacf66 Auto-generated-cl: translation import
2015-07-31Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I38662a5f47abad9d13f3bea48f031a099b8dc47b Auto-generated-cl: translation import
2015-07-29am bb214a94: (-s ours) am 6b8b382f: (-s ours) am e2b3f64e: (-s ours) am ↵Geoff Mendal
ceada86c: (-s ours) Import translations. DO NOT MERGE * commit 'bb214a9447a1589f6a575d6af30cc6ad627da765': Import translations. DO NOT MERGE
2015-07-29am 6b8b382f: (-s ours) am e2b3f64e: (-s ours) am ceada86c: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit '6b8b382f2197f01428a28d267b9ed4eb0bb909d7': Import translations. DO NOT MERGE
2015-07-29am e2b3f64e: (-s ours) am ceada86c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'e2b3f64ef3a6ae1c212bb7ec82bc03d6eab6f139': Import translations. DO NOT MERGE
2015-07-29am ceada86c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'ceada86c7087976b8a4823684926878bbec79137': Import translations. DO NOT MERGE
2015-07-29Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I890ab842d953bec4e549069295f8809dc31a5246 Auto-generated-cl: translation import
2015-07-29Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I062b0d29a1241b119c5b60b33a8c102cd3fa5c48 Auto-generated-cl: translation import
2015-07-28am 2612082f: am 4d0d81f7: am 46890059: am e87e4a8a: am f8f94b2f: InCallUI ↵Chaitanya Saggurthi
not dismissing after end call is clicked. * commit '2612082f39eba171634fb1039ccc6a0569bc3037': InCallUI not dismissing after end call is clicked.
2015-07-28am 4d0d81f7: am 46890059: am e87e4a8a: am f8f94b2f: InCallUI not dismissing ↵Chaitanya Saggurthi
after end call is clicked. * commit '4d0d81f760d7512754d5e11d18cb4308d4ad6af7': InCallUI not dismissing after end call is clicked.
2015-07-28am 46890059: am e87e4a8a: am f8f94b2f: InCallUI not dismissing after end ↵Chaitanya Saggurthi
call is clicked. * commit '46890059ff47195f6fd8b8bed5bbeeeb40cd607c': InCallUI not dismissing after end call is clicked.
2015-07-28am e87e4a8a: am f8f94b2f: InCallUI not dismissing after end call is clicked.Chaitanya Saggurthi
* commit 'e87e4a8a8ce9c4d7033a886b36639adcb7c36dd9': InCallUI not dismissing after end call is clicked.
2015-07-28am f8f94b2f: InCallUI not dismissing after end call is clicked.Chaitanya Saggurthi
* commit 'f8f94b2f55f9c63280aceb08876d9e02f90a6f71': InCallUI not dismissing after end call is clicked.
2015-07-28am 0be02352: am 57b6c31f: am 4db859b7: am e182bb44: Merge "Add support for ↵Tyler Gunn
showing child number in incall ui." into mnc-dr-dev * commit '0be0235249131b564482bc52c6017dd0699e9418': Add support for showing child number in incall ui.
2015-07-28InCallUI not dismissing after end call is clicked.Chaitanya Saggurthi
In MT InCallScreen, the customMessage dialog which appears when user tries to reject a call with message, is not set to null when user cancels the dialog. InCallUIActvity is not finished if there is any pending dialog which is not null and hence this issue is seen. Set the dialog variable to null once the dialog is cancelled by the user. Bug: 22254547 Change-Id: I86d314461c760387cb5f8099a01da9afe4a79085
2015-07-28am 57b6c31f: am 4db859b7: am e182bb44: Merge "Add support for showing child ↵Tyler Gunn
number in incall ui." into mnc-dr-dev * commit '57b6c31f264a028b6fb5c35ba8f8ac547c32563b': Add support for showing child number in incall ui.
2015-07-28am 4db859b7: am e182bb44: Merge "Add support for showing child number in ↵Tyler Gunn
incall ui." into mnc-dr-dev * commit '4db859b708911ec47c6488dc5cfa8cef65aee029': Add support for showing child number in incall ui.
2015-07-28am e182bb44: Merge "Add support for showing child number in incall ui." into ↵Tyler Gunn
mnc-dr-dev * commit 'e182bb448356d4836eea424f17024e7d726d33a2': Add support for showing child number in incall ui.
2015-07-28Merge "Add support for showing child number in incall ui." into mnc-dr-devTyler Gunn
2015-07-24am 2c00bfdc: am 55518649: am efe0226a: am 610c654b: am 3c80805d: Catch null ↵Anthony Lee
Call to avoid NullPointerException. * commit '2c00bfdce680c4245b60643d21847567d45b8fc8': Catch null Call to avoid NullPointerException.
2015-07-24am 55518649: am efe0226a: am 610c654b: am 3c80805d: Catch null Call to avoid ↵Anthony Lee
NullPointerException. * commit '555186493768cdb1722ed2354b9ed3bebde9f1c9': Catch null Call to avoid NullPointerException.
2015-07-24am efe0226a: am 610c654b: am 3c80805d: Catch null Call to avoid ↵Anthony Lee
NullPointerException. * commit 'efe0226a492cdd872bc7815a15fd965bcc10513d': Catch null Call to avoid NullPointerException.
2015-07-24am 610c654b: am 3c80805d: Catch null Call to avoid NullPointerException.Anthony Lee
* commit '610c654b5b7961d35969dcea7918be4d5a4b5043': Catch null Call to avoid NullPointerException.
2015-07-23Add support for showing child number in incall ui.Tyler Gunn
Bug: 22685113 Change-Id: I4cf8f92820fcc028d26b5edcbf9bbc02a4d7a6d5
2015-07-22am 3c80805d: Catch null Call to avoid NullPointerException.Anthony Lee
* commit '3c80805def993eef821931970723e2b927fdf552': Catch null Call to avoid NullPointerException.
2015-07-22Catch null Call to avoid NullPointerException.Anthony Lee
Bug: 22646355 Change-Id: Iad8f4ed9b29f97b3c6d403b63f9fdf7f3b26f460
2015-07-15am 83938c0c: (-s ours) am f276882c: (-s ours) am 4e8349bb: (-s ours) am ↵Geoff Mendal
f998875f: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGE * commit '83938c0cef2fc693b7ddbd888a0d88bc6c9ececd': Import translations. DO NOT MERGE
2015-07-15am f276882c: (-s ours) am 4e8349bb: (-s ours) am f998875f: (-s ours) am ↵Geoff Mendal
3e2d53b0: (-s ours) Import translations. DO NOT MERGE * commit 'f276882cb2ffb55f4e9c16cc55b5ef21c3a6d488': Import translations. DO NOT MERGE
2015-07-15am 4e8349bb: (-s ours) am f998875f: (-s ours) am 3e2d53b0: (-s ours) Import ↵Geoff Mendal
translations. DO NOT MERGE * commit '4e8349bb8a7558781c96e1c27f41541485fcd7f3': Import translations. DO NOT MERGE
2015-07-15am f998875f: (-s ours) am 3e2d53b0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit 'f998875f666420fc6dc7b65b56773d43ee72de52': Import translations. DO NOT MERGE
2015-07-15am 3e2d53b0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
* commit '3e2d53b02ca20c2e71b70232f81a17ed4ac776d1': Import translations. DO NOT MERGE
2015-07-15Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If10314ac8f18e57c4ad5938086aa3c302c7f6c8d Auto-generated-cl: translation import
2015-07-15Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Ib670e6b50bfe742282d850a66106ebb1ab41ae7a Auto-generated-cl: translation import
2015-07-14am cc81d793: am 8c9aa3cb: am 5eb0993c: am bcf67a24: am 599477af: Null ↵Yorke Lee
protect getUi() in configureAnswerTargetsForSms * commit 'cc81d79368ffc2f5df5ac6f4baefbd2155632848': Null protect getUi() in configureAnswerTargetsForSms
2015-07-14am 0fa39463: am 0dbd837f: am 65f96a6f: am cc0443f3: am 0a624eba: Merge ↵Yorke Lee
"Disable LayoutTransition.CHANGING" into mnc-dev * commit '0fa394634e20848faea72c0ee8bd4102641789f5': Disable LayoutTransition.CHANGING
2015-07-14am 8c9aa3cb: am 5eb0993c: am bcf67a24: am 599477af: Null protect getUi() in ↵Yorke Lee
configureAnswerTargetsForSms * commit '8c9aa3cb0f279796df48948ad87b170b742c8d75': Null protect getUi() in configureAnswerTargetsForSms
2015-07-14am 0dbd837f: am 65f96a6f: am cc0443f3: am 0a624eba: Merge "Disable ↵Yorke Lee
LayoutTransition.CHANGING" into mnc-dev * commit '0dbd837fca57e320d0143500848d1c8221b0d502': Disable LayoutTransition.CHANGING
2015-07-14am 5eb0993c: am bcf67a24: am 599477af: Null protect getUi() in ↵Yorke Lee
configureAnswerTargetsForSms * commit '5eb0993cf86b68972e0e790b888c6640a140dfb0': Null protect getUi() in configureAnswerTargetsForSms
2015-07-14am 65f96a6f: am cc0443f3: am 0a624eba: Merge "Disable ↵Yorke Lee
LayoutTransition.CHANGING" into mnc-dev * commit '65f96a6fd6fcb7bf24f063688b43786435c7addc': Disable LayoutTransition.CHANGING
2015-07-13am bcf67a24: am 599477af: Null protect getUi() in configureAnswerTargetsForSmsYorke Lee
* commit 'bcf67a242d110aa666e695adf3c6517f9805f2e4': Null protect getUi() in configureAnswerTargetsForSms
2015-07-13am cc0443f3: am 0a624eba: Merge "Disable LayoutTransition.CHANGING" into mnc-devYorke Lee
* commit 'cc0443f3e0b8f4fce6ff41778d3e3c41e819142f': Disable LayoutTransition.CHANGING
2015-07-13am 599477af: Null protect getUi() in configureAnswerTargetsForSmsYorke Lee
* commit '599477afdf26bee779515ead4638effea8d6beaa': Null protect getUi() in configureAnswerTargetsForSms
2015-07-13am 0a624eba: Merge "Disable LayoutTransition.CHANGING" into mnc-devYorke Lee
* commit '0a624eba6d80b1970e05332c3e8877e631f63591': Disable LayoutTransition.CHANGING
2015-07-13Null protect getUi() in configureAnswerTargetsForSmsYorke Lee
Bug: 22442874 Change-Id: Id3d522415db3a551c646950a7023478226182ae9
2015-07-13am fcb95410: (-s ours) am 7f38172d: (-s ours) am f829725a: (-s ours) am ↵Geoff Mendal
eb827719: (-s ours) Import translations. DO NOT MERGE * commit 'fcb95410a510150b64b7a3e3af0a672f7bfa3fed': Import translations. DO NOT MERGE